diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index e7f500bbecc..998883210cd 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -13177,12 +13177,6 @@
      {}
     ]
    ],
-   "mathml/relations/html5-tree/href-manual.html": [
-    [
-     "/mathml/relations/html5-tree/href-manual.html",
-     {}
-    ]
-   ],
    "mediacapture-depth/dictionary-manual.https.html": [
     [
      "/mediacapture-depth/dictionary-manual.https.html",
@@ -206259,6 +206253,16 @@
      {}
     ]
    ],
+   "common/security-features/README.md": [
+    [
+     {}
+    ]
+   ],
+   "common/security-features/resources/common.js": [
+    [
+     {}
+    ]
+   ],
    "common/sleep.py": [
     [
      {}
@@ -304459,11 +304463,6 @@
      {}
     ]
    ],
-   "mixed-content/generic/common.js": [
-    [
-     {}
-    ]
-   ],
    "mixed-content/generic/expect.py": [
     [
      {}
@@ -306354,11 +306353,6 @@
      {}
     ]
    ],
-   "referrer-policy/generic/common.js": [
-    [
-     {}
-    ]
-   ],
    "referrer-policy/generic/multiple-headers-and-values.html.headers": [
     [
      {}
@@ -386909,6 +386903,14 @@
      {}
     ]
    ],
+   "mathml/relations/html5-tree/href-click-3.html": [
+    [
+     "/mathml/relations/html5-tree/href-click-3.html",
+     {
+      "testdriver": true
+     }
+    ]
+   ],
    "mathml/relations/html5-tree/required-extensions-1.html": [
     [
      "/mathml/relations/html5-tree/required-extensions-1.html",
@@ -462112,6 +462114,14 @@
    "6805c323df5a975231648b830e33ce183c3cbbd3",
    "support"
   ],
+  "common/security-features/README.md": [
+   "45cd74ede74d6c2fdaac80690a4e8a6b99f4976c",
+   "support"
+  ],
+  "common/security-features/resources/common.js": [
+   "678d2a0d8fa7001e5dcd2204b6f2b548d0b913c1",
+   "support"
+  ],
   "common/sleep.py": [
    "afc0a7c26e1c2aa63a54bcf39d74cf9c7adf6d75",
    "support"
@@ -572209,7 +572219,7 @@
    "testharness"
   ],
   "css/css-position/parsing/z-index-invalid.html": [
-   "ceb7448dd0b87b3b41c54d450b31cf86e539d455",
+   "d89720ab146056a6b4d24214b100d249cfac3ab1",
    "testharness"
   ],
   "css/css-position/parsing/z-index-valid.html": [
@@ -593893,7 +593903,7 @@
    "testharness"
   ],
   "css/css-values/calc-numbers.html": [
-   "995595b8a3e91ab3a72ec465d509030f082ea5bf",
+   "e9ade71e22f5d20bbb8de15c6ddf9acd99fd44b6",
    "testharness"
   ],
   "css/css-values/calc-parenthesis-stack.html": [
@@ -622717,7 +622727,7 @@
    "testharness"
   ],
   "fetch/sec-metadata/img.tentative.https.sub.html": [
-   "befc7a973bbe2f751088089533414fa6b2dd8669",
+   "802ae25b775c0b246d162cc8f41df0c47cd52867",
    "testharness"
   ],
   "fetch/sec-metadata/object.tentative.https.sub.html": [
@@ -645045,11 +645055,11 @@
    "support"
   ],
   "mathml/README.md": [
-   "175c1813deeb7b784925cbb87e7990fb3f056fce",
+   "9524d275e479ba2db2aaaab9fdbc1203c79009cb",
    "support"
   ],
   "mathml/presentation-markup/fractions/frac-1.html": [
-   "848eb5b144cef3740b794475f699229243c1287e",
+   "6b9fb2844298cbc228f91a23c6439e0f67f4f20b",
    "testharness"
   ],
   "mathml/presentation-markup/fractions/frac-bar-001-ref.html": [
@@ -645057,7 +645067,7 @@
    "support"
   ],
   "mathml/presentation-markup/fractions/frac-bar-001.html": [
-   "6688a587b1f25e2523ef5fd2535227381a1c263d",
+   "d6151f62190768776e1a85b4c9b9bc6a8c0a69a6",
    "reftest"
   ],
   "mathml/presentation-markup/fractions/frac-color-001-notref.html": [
@@ -645065,7 +645075,7 @@
    "support"
   ],
   "mathml/presentation-markup/fractions/frac-color-001.html": [
-   "bc61dbf51ffe487122859f189223b2ef43f88bb1",
+   "d1a3e6eac41ff23190225954016b7b37a8e71880",
    "reftest"
   ],
   "mathml/presentation-markup/fractions/frac-color-002-ref.html": [
@@ -645073,7 +645083,7 @@
    "support"
   ],
   "mathml/presentation-markup/fractions/frac-color-002.html": [
-   "d7cc88cb21bd9ed62d9a269e1029f113f9a27d13",
+   "597acab652c4ad9b94ec5c612b4fda53c422309c",
    "reftest"
   ],
   "mathml/presentation-markup/fractions/frac-linethickness-001-ref.html": [
@@ -645081,7 +645091,7 @@
    "support"
   ],
   "mathml/presentation-markup/fractions/frac-linethickness-001.html": [
-   "94111174c6aa3ecf1fff4982bfc9ecbf4a10c2ee",
+   "83e15c83dc0bcb911eb52a6b74b86a13c2f1e31e",
    "reftest"
   ],
   "mathml/presentation-markup/fractions/frac-linethickness-002-ref.html": [
@@ -645089,7 +645099,7 @@
    "support"
   ],
   "mathml/presentation-markup/fractions/frac-linethickness-002.html": [
-   "5bb0d6bfb9d6113a04b9d3160ccc9db80aceaaa6",
+   "fd45994646938e4d22765524382004f19ef021b7",
    "reftest"
   ],
   "mathml/presentation-markup/fractions/frac-linethickness-003-notref.html": [
@@ -645097,7 +645107,7 @@
    "support"
   ],
   "mathml/presentation-markup/fractions/frac-linethickness-003.html": [
-   "e535e703b52c75800155b5b25995730b2a236287",
+   "b23cce80be40dd53ff898a5bc7d2246ae3770322",
    "reftest"
   ],
   "mathml/presentation-markup/fractions/frac-mrow-001-ref.html": [
@@ -645105,7 +645115,7 @@
    "support"
   ],
   "mathml/presentation-markup/fractions/frac-mrow-001.html": [
-   "e5c6f52529443e881b8235a67f3e8cc7aa10fb51",
+   "14476450008531dba09da4677b60ba65262dca0a",
    "reftest"
   ],
   "mathml/presentation-markup/fractions/frac-numalign-denomalign-001-ref.html": [
@@ -645113,15 +645123,15 @@
    "support"
   ],
   "mathml/presentation-markup/fractions/frac-numalign-denomalign-001.html": [
-   "61f49e2ff5381c9684e5b36d03a51daf7f8f3e74",
+   "d734f1d1f33922d5d29daa81d2ba7b1075415b23",
    "reftest"
   ],
   "mathml/presentation-markup/fractions/frac-parameters-1.html": [
-   "543017e19006377cac0c1a434bd43400467fac3b",
+   "59e335ae5a3df081e300705d6e5d020924af7bef",
    "testharness"
   ],
   "mathml/presentation-markup/fractions/frac-parameters-2.html": [
-   "75074875c9e6b1fa205fe76b85c4a0b36fadf274",
+   "b1ee502ccdae6cf96d2f104d7daf1c2dbba390f7",
    "testharness"
   ],
   "mathml/presentation-markup/fractions/frac-visibility-001-ref.html": [
@@ -645129,67 +645139,67 @@
    "support"
   ],
   "mathml/presentation-markup/fractions/frac-visibility-001.html": [
-   "b98f68d2a585d340804b27120a89d8e71e4c9e51",
+   "8fbf5ac806e61e400214b2157180e8aac4fd2d31",
    "reftest"
   ],
   "mathml/presentation-markup/operators/mo-axis-height-1.html": [
-   "7b0031ac1ed63219130b69113ebbfdc28eec10d6",
+   "c88484b9d59a7811f6cfde7065de4facbdf1f74a",
    "testharness"
   ],
   "mathml/presentation-markup/radicals/root-parameters-1.html": [
-   "8ffcbe4a22d1225e4494d91437200ca8361a27bf",
+   "51d4713d4ea1c429e018c6a0914b130bc6dc1cd5",
    "testharness"
   ],
   "mathml/presentation-markup/scripts/subsup-1.html": [
-   "39768315e72d13b5952e3bc743617a8d29b223ca",
+   "447aa66d4a30bc68f69fc17f91b08723229b14ff",
    "testharness"
   ],
   "mathml/presentation-markup/scripts/subsup-2.html": [
-   "26fa5de780b086a777fb6494cfb6f163b7813e02",
+   "9e2b6dbef79089fe4c37ddbf6cbbdc4e7a3f1d36",
    "testharness"
   ],
   "mathml/presentation-markup/scripts/subsup-3.html": [
-   "231f65ab4f46bbe64a20a7db170ffb42deef460f",
+   "742fa8cbce6463bcc2bb48bcdd98df488d1c086f",
    "testharness"
   ],
   "mathml/presentation-markup/scripts/subsup-4.html": [
-   "c4bf4382f8ed51849d396cd313ff851fe70248e4",
+   "fc70fef9b801f41a32913ba4362927bedb94d0ef",
    "testharness"
   ],
   "mathml/presentation-markup/scripts/subsup-5.html": [
-   "005ceea4019918f47606e25a91654a841b1e437a",
+   "a67d68d5e031c1a8b31df877b213d255f002b935",
    "testharness"
   ],
   "mathml/presentation-markup/scripts/subsup-parameters-1.html": [
-   "b0ebaceb4355b4ddafff11febb41e36a5afe854c",
+   "208a0a870d6e61e3c7530fc620e650e00ca740da",
    "testharness"
   ],
   "mathml/presentation-markup/scripts/subsup-parameters-2.html": [
-   "5ba66b86c3dadf5b4e4d3ddfa4c27d6286e137f1",
+   "4a9db6618bcc1fa9fd459d9b0aa70f347bc62184",
    "testharness"
   ],
   "mathml/presentation-markup/scripts/underover-1.html": [
-   "6dcdbb7b388b6955e744f5d9eb9e1e27e9abef34",
+   "45367e3541b285bcc6256193ab7cd544baf422f3",
    "testharness"
   ],
   "mathml/presentation-markup/scripts/underover-parameters-1.html": [
-   "802293829fd8de194ae6a12b0aea458689770ae1",
+   "cc09abb899ad629fb959aef9fc84f093ad0a6f76",
    "testharness"
   ],
   "mathml/presentation-markup/scripts/underover-parameters-2.html": [
-   "e9d6af4901e16602dd7a54a7c74f3594e26402c9",
+   "d6d9185cc961c0d6d7e52825563b30c622f015a2",
    "testharness"
   ],
   "mathml/presentation-markup/scripts/underover-parameters-3.html": [
-   "373d6d4d06ecc0593dfda27164fe26a4d55dc1d1",
+   "23c7dfa744550ecf4032350fdf902f28863dac57",
    "testharness"
   ],
   "mathml/presentation-markup/scripts/underover-parameters-4.html": [
-   "3b1fa575f72473443271ebbd193bfc7b866dfc1a",
+   "bfc3cafa913fb38dde5cecf83be0a4a710bfb763",
    "testharness"
   ],
   "mathml/presentation-markup/spaces/space-1.html": [
-   "cb9dd9e9acbddd54c3729962f4efa4eeb56d8452",
+   "7bc5b8e5128d031c14d73b53939926a63265b3c9",
    "testharness"
   ],
   "mathml/presentation-markup/spaces/space-2-ref.html": [
@@ -645197,11 +645207,11 @@
    "support"
   ],
   "mathml/presentation-markup/spaces/space-2.html": [
-   "072f2bda542f9b9ee64acd3161f2949c31fbf955",
+   "5b8351a1ed00d29e43d71e1f293fe63b1a0c2dc4",
    "reftest"
   ],
   "mathml/presentation-markup/tables/table-axis-height.html": [
-   "024bdd29b116de1c3112e9482a2f4ce286126a91",
+   "e723008b410342b087a0f066980f8520e55c4ccc",
    "testharness"
   ],
   "mathml/relations/css-styling/color-1-ref.html": [
@@ -645209,7 +645219,7 @@
    "support"
   ],
   "mathml/relations/css-styling/color-1.html": [
-   "4ef821340d22109a64809bbb4a1a753279d91420",
+   "8158cec6a86475d98042df02e8e89928516184d3",
    "reftest"
   ],
   "mathml/relations/css-styling/display-1-ref.html": [
@@ -645217,11 +645227,11 @@
    "support"
   ],
   "mathml/relations/css-styling/display-1.html": [
-   "a7d6277d70d1658bf291c5d46ed14aa2e1f7ec90",
+   "9ae6fe0b84f4d7b145b7fef0ed16168c3f4a74dd",
    "reftest"
   ],
   "mathml/relations/css-styling/displaystyle-1.html": [
-   "3143343da7e39ff931f552af942e62882062bc77",
+   "ddb2173a2e01ff78b16bc9c86f4a0f2ad37935dc",
    "testharness"
   ],
   "mathml/relations/css-styling/lengths-1-ref.html": [
@@ -645229,7 +645239,7 @@
    "support"
   ],
   "mathml/relations/css-styling/lengths-1.html": [
-   "e5864ccc2acaf9fb602274db13b7f6bc846563a3",
+   "0e3a74d46f99090883f5e12dd1d0701bf50bda8a",
    "reftest"
   ],
   "mathml/relations/css-styling/lengths-2-ref.html": [
@@ -645237,11 +645247,11 @@
    "support"
   ],
   "mathml/relations/css-styling/lengths-2.html": [
-   "e88111aa537c9223e9203f69c8afd6ed5d3d4390",
+   "37cc640b30783ad717d7eef8551b47754f7c9986",
    "reftest"
   ],
   "mathml/relations/css-styling/lengths-3.html": [
-   "68a144aca69c4fac862073029d8479369773e25a",
+   "aa38e9729de8569151b98307395ec8a2a5fe4b7f",
    "testharness"
   ],
   "mathml/relations/css-styling/mathvariant-bold-fraktur-ref.html": [
@@ -645249,7 +645259,7 @@
    "support"
   ],
   "mathml/relations/css-styling/mathvariant-bold-fraktur.html": [
-   "487d61d7d852ad850a9d99d56a1f82b92138bf8b",
+   "f4141810820518d0b1b3c2d832827dbaa77c6871",
    "reftest"
   ],
   "mathml/relations/css-styling/mathvariant-bold-italic-ref.html": [
@@ -645257,7 +645267,7 @@
    "support"
   ],
   "mathml/relations/css-styling/mathvariant-bold-italic.html": [
-   "640baf34da88b9851f3c06a60c7e81baac21be3a",
+   "7b53e986d4f07796c8d44a8356081082ad238d96",
    "reftest"
   ],
   "mathml/relations/css-styling/mathvariant-bold-ref.html": [
@@ -645269,7 +645279,7 @@
    "support"
   ],
   "mathml/relations/css-styling/mathvariant-bold-sans-serif.html": [
-   "1cab2372ba3405e63f615354b1b61ba98c5d0bed",
+   "544db02f2eedc3229e57eac3016e3aa086061704",
    "reftest"
   ],
   "mathml/relations/css-styling/mathvariant-bold-script-ref.html": [
@@ -645277,11 +645287,11 @@
    "support"
   ],
   "mathml/relations/css-styling/mathvariant-bold-script.html": [
-   "9083afa801d7132b7f6a095d14913a6b3e83f449",
+   "dc48fbeaaf54ba184e02f062f074443de0e4835b",
    "reftest"
   ],
   "mathml/relations/css-styling/mathvariant-bold.html": [
-   "b3fe917d23c67476667cc8492b218a5a38cbfc7f",
+   "a51be7b23fd2bdbc9364a29a0766b53dea67dad2",
    "reftest"
   ],
   "mathml/relations/css-styling/mathvariant-double-struck-ref.html": [
@@ -645289,7 +645299,7 @@
    "support"
   ],
   "mathml/relations/css-styling/mathvariant-double-struck.html": [
-   "e51908e1ea39fccdca8ba481c176bd3436d5bbf3",
+   "3090fdc85c04d037f391c34dec615ce8827c222c",
    "reftest"
   ],
   "mathml/relations/css-styling/mathvariant-fraktur-ref.html": [
@@ -645297,7 +645307,7 @@
    "support"
   ],
   "mathml/relations/css-styling/mathvariant-fraktur.html": [
-   "124891727cd43dd94cd4408b633169cc57c57e67",
+   "8bd15a558bf77d652237a6470cd64401f1787134",
    "reftest"
   ],
   "mathml/relations/css-styling/mathvariant-initial-ref.html": [
@@ -645305,7 +645315,7 @@
    "support"
   ],
   "mathml/relations/css-styling/mathvariant-initial.html": [
-   "df9e0af7fc53f6486d43e28db588508deaa3aa24",
+   "58751bd1266971584260bc5d2c25935da4951672",
    "reftest"
   ],
   "mathml/relations/css-styling/mathvariant-italic-ref.html": [
@@ -645313,7 +645323,7 @@
    "support"
   ],
   "mathml/relations/css-styling/mathvariant-italic.html": [
-   "e1612a528c8976e76d0f0990621f80880992b7f1",
+   "5bcbd322de85c885987457b128ad71bd7de72601",
    "reftest"
   ],
   "mathml/relations/css-styling/mathvariant-looped-ref.html": [
@@ -645321,7 +645331,7 @@
    "support"
   ],
   "mathml/relations/css-styling/mathvariant-looped.html": [
-   "81206e1facff7ead839d4df329c80c6896771b8d",
+   "0326e86e8f4faf907b3698d319160242949bb0e5",
    "reftest"
   ],
   "mathml/relations/css-styling/mathvariant-monospace-ref.html": [
@@ -645329,7 +645339,7 @@
    "support"
   ],
   "mathml/relations/css-styling/mathvariant-monospace.html": [
-   "8d4a4ad9234378ab503cfbeca89ec8cebee7b3c3",
+   "8d9a5d3df27c1a8e85e00c6fee00ff3ddb8ef066",
    "reftest"
   ],
   "mathml/relations/css-styling/mathvariant-sans-serif-bold-italic-ref.html": [
@@ -645337,7 +645347,7 @@
    "support"
   ],
   "mathml/relations/css-styling/mathvariant-sans-serif-bold-italic.html": [
-   "70207367e0588f9460e9fc3e118103768a14b9f6",
+   "21401bc84ac95a40069b471f824b4e05e116d171",
    "reftest"
   ],
   "mathml/relations/css-styling/mathvariant-sans-serif-italic-ref.html": [
@@ -645345,7 +645355,7 @@
    "support"
   ],
   "mathml/relations/css-styling/mathvariant-sans-serif-italic.html": [
-   "0576236dbf990669602b031786174c5c12a25537",
+   "2573872319148c1c0bdfb359858a5369c28cc176",
    "reftest"
   ],
   "mathml/relations/css-styling/mathvariant-sans-serif-ref.html": [
@@ -645353,7 +645363,7 @@
    "support"
   ],
   "mathml/relations/css-styling/mathvariant-sans-serif.html": [
-   "fc880b99aff3cc117af5394b5290412a373a1c96",
+   "513e0351cc3f3e714d76adc0379fd4421ac90080",
    "reftest"
   ],
   "mathml/relations/css-styling/mathvariant-script-ref.html": [
@@ -645361,7 +645371,7 @@
    "support"
   ],
   "mathml/relations/css-styling/mathvariant-script.html": [
-   "5725ed510331d29cda6f08056b83378b5da88d82",
+   "efd3f7e8ff6925a7941ea387f65faf63c5186f01",
    "reftest"
   ],
   "mathml/relations/css-styling/mathvariant-stretched-ref.html": [
@@ -645369,7 +645379,7 @@
    "support"
   ],
   "mathml/relations/css-styling/mathvariant-stretched.html": [
-   "603cfe704fd0605dd15fb71ef1ae0b0e54260190",
+   "20c5a39a83a75e1736bd4cdcb7baf81952667856",
    "reftest"
   ],
   "mathml/relations/css-styling/mathvariant-tailed-ref.html": [
@@ -645377,7 +645387,7 @@
    "support"
   ],
   "mathml/relations/css-styling/mathvariant-tailed.html": [
-   "c00417d8d6ac3a553c930b0f1c753652fa804475",
+   "c88d433ce5f43314c1f1249aa48d36ca0141b4a0",
    "reftest"
   ],
   "mathml/relations/css-styling/visibility-1-ref.html": [
@@ -645385,7 +645395,7 @@
    "support"
   ],
   "mathml/relations/css-styling/visibility-1.html": [
-   "be8da3b00a2adafcbd3908733c1edea55f90fddb",
+   "c84f97aeeb84d79b7937338445de720986f246ce",
    "reftest"
   ],
   "mathml/relations/html5-tree/class-1-ref.html": [
@@ -645393,11 +645403,11 @@
    "support"
   ],
   "mathml/relations/html5-tree/class-1.html": [
-   "654852329b4abe04a9c2736586cb7f4dc63a8562",
+   "ee4b4b50d3f4d630c80fea170008b73d5b4b9851",
    "reftest"
   ],
   "mathml/relations/html5-tree/class-2.html": [
-   "707500de37fc117bf6174bd9aa7aaba298a705da",
+   "4e1ae6b707405d900e309ac11792606a6a6f295e",
    "testharness"
   ],
   "mathml/relations/html5-tree/color-attributes-1-ref.html": [
@@ -645405,11 +645415,11 @@
    "support"
   ],
   "mathml/relations/html5-tree/color-attributes-1.html": [
-   "b7bdf723e38149b0f30522bda8634fa5ac94b286",
+   "6f9f93721a2a9173c9efb156bcc875bd61123edb",
    "reftest"
   ],
   "mathml/relations/html5-tree/display-1.html": [
-   "64d862cf7614f29435a08a6ac66d45f84575a053",
+   "77038ee223c5a319f8536f01532530093dc69c18",
    "testharness"
   ],
   "mathml/relations/html5-tree/dynamic-1-ref.html": [
@@ -645417,7 +645427,7 @@
    "support"
   ],
   "mathml/relations/html5-tree/dynamic-1.html": [
-   "ab22ad13cdbd612eabbd160a66867472bed716a8",
+   "48fdd25915598b63a849752260349b2bd2186720",
    "reftest"
   ],
   "mathml/relations/html5-tree/href-click-1-ref.html": [
@@ -645425,7 +645435,7 @@
    "support"
   ],
   "mathml/relations/html5-tree/href-click-1.html": [
-   "6164346dc079da139855de96937f9d5b7861c285",
+   "dd6b7990a3c1719ff66c8e93d9d98b3ea97bfdf0",
    "reftest"
   ],
   "mathml/relations/html5-tree/href-click-2-ref.html": [
@@ -645433,19 +645443,19 @@
    "support"
   ],
   "mathml/relations/html5-tree/href-click-2.html": [
-   "6e5049392bd9c62e42086f3d1a7cdc9583fd29a9",
+   "4c5253df1596d4acf6208579fea731b058ac1a58",
    "reftest"
   ],
-  "mathml/relations/html5-tree/href-manual.html": [
-   "7f24f20f4f2b8756409d5cd9daf5ed364ba72431",
-   "manual"
+  "mathml/relations/html5-tree/href-click-3.html": [
+   "f2863febc1f14d4e1170b1ebcddb9bf30aedfd24",
+   "testharness"
   ],
   "mathml/relations/html5-tree/integration-point-1-ref.html": [
    "49877549670ae9fdd81e24801c74756465c4c595",
    "support"
   ],
   "mathml/relations/html5-tree/integration-point-1.html": [
-   "b3ab19c773875a6778b9588eee0f3c9cada56763",
+   "3221a67503bc0cba619715c1fd25d1e2c2ce1081",
    "reftest"
   ],
   "mathml/relations/html5-tree/integration-point-2-ref.html": [
@@ -645453,7 +645463,7 @@
    "support"
   ],
   "mathml/relations/html5-tree/integration-point-2.html": [
-   "e970f9ec8053879844bf5b50e2822fd34b6f93a0",
+   "d42eeb03ed21d133decebb8ee287c23ac08d9699",
    "reftest"
   ],
   "mathml/relations/html5-tree/integration-point-3-ref.html": [
@@ -645461,11 +645471,11 @@
    "support"
   ],
   "mathml/relations/html5-tree/integration-point-3.html": [
-   "8132acc6d7c2b172fec1509b8af591630362f14f",
+   "1feb8317ff12252bc131dd7368c8162b79a0d803",
    "reftest"
   ],
   "mathml/relations/html5-tree/required-extensions-1.html": [
-   "795f516671a616f48038cb16b6cc82329e5826b4",
+   "3dd7f168ec1e2d61e7b98d8987b94050babe5bb0",
    "testharness"
   ],
   "mathml/relations/html5-tree/required-extensions-2-ref.html": [
@@ -645473,7 +645483,7 @@
    "support"
   ],
   "mathml/relations/html5-tree/required-extensions-2.html": [
-   "b49bddaa69d4e88993301d36b0d802a4d0b8ab12",
+   "1d7af04d9edcb76cd870e63145d3d7096bd59c09",
    "reftest"
   ],
   "mathml/relations/html5-tree/unique-identifier-1-iframe-1.html": [
@@ -645489,11 +645499,11 @@
    "support"
   ],
   "mathml/relations/html5-tree/unique-identifier-1.html": [
-   "39c49a6b56b4e64a59ae2835081ed18c2e6a4c86",
+   "42a547ac218f1d8590fd48a0d6331ef3b1c2c86d",
    "reftest"
   ],
   "mathml/relations/html5-tree/unique-identifier-2.html": [
-   "97e04a91ef13e650757fc2fe01ef068932e31b16",
+   "421ad7a86d03861084a98ea00b17e7b77e1365f5",
    "testharness"
   ],
   "mathml/relations/html5-tree/unique-identifier-3-ref.html": [
@@ -645501,7 +645511,7 @@
    "support"
   ],
   "mathml/relations/html5-tree/unique-identifier-3.html": [
-   "5d66e133ab08b3068306cb2252094262716aaed5",
+   "c58e5026cfad049bef38d825df256cc0111c7b8c",
    "reftest"
   ],
   "mathml/relations/text-and-math/use-typo-metrics-1-ref.html": [
@@ -645509,7 +645519,7 @@
    "support"
   ],
   "mathml/relations/text-and-math/use-typo-metrics-1.html": [
-   "081d66b63212bbba825913b6c1aa2f0a3609a6e1",
+   "3797aef5fc0fa316cd8268accd8501be88cd6c44",
    "reftest"
   ],
   "mathml/tools/axisheight.py": [
@@ -645529,7 +645539,7 @@
    "support"
   ],
   "mathml/tools/mathvariant-transforms.py": [
-   "6094a74491d337a2d75bbc7d1ba9e73a455be05d",
+   "ba99b595f0aa6338ba7a752801c4a32dbbefc9ef",
    "support"
   ],
   "mathml/tools/radicals.py": [
@@ -646581,7 +646591,7 @@
    "support"
   ],
   "mixed-content/audio-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
-   "ac620c1075b73cae5dc0803f2e8c366105794fce",
+   "cb58cbcd9c98d3c6f67b237c5e6363cc35974010",
    "testharness"
   ],
   "mixed-content/audio-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
@@ -646589,7 +646599,7 @@
    "support"
   ],
   "mixed-content/audio-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
-   "abc81b30191fabba25ba0461d4113d4920b95e52",
+   "815d926629c2350ac924ded0188ce42587f8addc",
    "testharness"
   ],
   "mixed-content/audio-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
@@ -646597,7 +646607,7 @@
    "support"
   ],
   "mixed-content/audio-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
-   "27c67b081ddd75c4069db6fe8ff696bc3dd18f6f",
+   "3a9ba21f0b184368d6336ae61afc4a0fd7965826",
    "testharness"
   ],
   "mixed-content/audio-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
@@ -646605,7 +646615,7 @@
    "support"
   ],
   "mixed-content/audio-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
-   "5fd63aa6d0b5b0d5ec6f8ece4efb537d8276420a",
+   "163b1dcb6129b908b120476e051ad5075b29b1a8",
    "testharness"
   ],
   "mixed-content/audio-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
@@ -646613,7 +646623,7 @@
    "support"
   ],
   "mixed-content/audio-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
-   "e6f742213cc05fab2d9e97b497b8fd3b1a00784f",
+   "4dbbc6c424a084ba65ffe196a3111c3255adc26b",
    "testharness"
   ],
   "mixed-content/audio-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
@@ -646621,7 +646631,7 @@
    "support"
   ],
   "mixed-content/audio-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
-   "522e94420724e75833f9e2053ac00ee9e63b0ec5",
+   "c3bc943e1db9aeb5f507d0820326c4fc69e93abf",
    "testharness"
   ],
   "mixed-content/audio-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
@@ -646629,7 +646639,7 @@
    "support"
   ],
   "mixed-content/audio-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "5e6b8cbe168b612323aacfa6dde88a34f79b7ae5",
+   "2c8a8cc34625a7985d3ec01db042184d0bc9d35a",
    "testharness"
   ],
   "mixed-content/audio-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
@@ -646637,7 +646647,7 @@
    "support"
   ],
   "mixed-content/audio-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "0adc65f828b2cfbb0fb1cae5950c4c0f2083d913",
+   "d97aaba240a4b0ae52b3226a82d847ec364a8add",
    "testharness"
   ],
   "mixed-content/audio-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
@@ -646645,51 +646655,51 @@
    "support"
   ],
   "mixed-content/audio-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
-   "283c34207bf4f789be959f1f6a1fe5a9517a491f",
+   "c04597dc71ec1f841d0e79a87716775893aceb40",
    "testharness"
   ],
   "mixed-content/audio-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
-   "1c65507b4cef3589063981f50777fc0d5da9ba68",
+   "5b0987b3a0c885904f0c36e0bb080a1465d83a1f",
    "testharness"
   ],
   "mixed-content/audio-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "a29157047a6eb15fae5e451ba49fe18491aa1ee5",
+   "0253efc8239226441fadfd192044fa6d8065ce15",
    "testharness"
   ],
   "mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
-   "15fe5d2afc1c70014c323be9d5ad00c22632fac7",
+   "238565ff7267d479deac173a9ca2dd8d78708de7",
    "testharness"
   ],
   "mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html": [
-   "2da4a2b9361c268d882f98ba279fe5cca8ab2152",
+   "8ddc972ca6bafe42ee5e6533cb698babef180827",
    "testharness"
   ],
   "mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
-   "8b610ada7db6d4e1ff3efdc5fa63bed85a8a6a5a",
+   "09ffb26b9483796cfb0beca86ebcb58123d7ee21",
    "testharness"
   ],
   "mixed-content/audio-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
-   "cd4d8a52e76a24345ff4f5fd744b889b1e84196b",
+   "b17073db2e3c7eb8cfed77df63e39586e0218f0b",
    "testharness"
   ],
   "mixed-content/audio-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html": [
-   "20d31cf690ed629aa019fa2fc5945cec35713c25",
+   "6e86a30890fe99544e1f59eb6b97e7279a01b923",
    "testharness"
   ],
   "mixed-content/audio-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
-   "2ed233dc8856e96844c771bd3bbf7f6365a36dde",
+   "1aae605aa8f9bd492dd09736b807ce1f4e712d43",
    "testharness"
   ],
   "mixed-content/audio-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "b30f28b2aab693ac8675f2f8e89e170ef2098fe1",
+   "b8ef228f54c9aeff90dfaabdbbc743d8fd19775e",
    "testharness"
   ],
   "mixed-content/audio-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "c13fd88e47e95062912a1a8ef2a9ee66dd83592f",
+   "51302745cbf4cc34734f4ea6f2c3d0cd495154bf",
    "testharness"
   ],
   "mixed-content/beacon-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "f0c5ae172baf10ceace32750db54b207f372a907",
+   "52aef359f77032d6bd37e3375b26f1f426269171",
    "testharness"
   ],
   "mixed-content/beacon-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -646697,7 +646707,7 @@
    "support"
   ],
   "mixed-content/beacon-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "e592db53c3c844eb18aa1ec0335749331a18469d",
+   "44fb9c586a2dd45c56ee06e9cfdce7a5448c34ee",
    "testharness"
   ],
   "mixed-content/beacon-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -646705,7 +646715,7 @@
    "support"
   ],
   "mixed-content/beacon-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "ee9c3c6d22dd091846f32d90dccc464fb1a32997",
+   "bd211c00f5da0b017738e8fea8313c9af609ab35",
    "testharness"
   ],
   "mixed-content/beacon-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -646713,7 +646723,7 @@
    "support"
   ],
   "mixed-content/beacon-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "e050885df3b07d9be3869b6cd9335093d3a011c2",
+   "fbb550269e5095bca286c7e7c00875c02bece00e",
    "testharness"
   ],
   "mixed-content/beacon-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -646721,7 +646731,7 @@
    "support"
   ],
   "mixed-content/beacon-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "369044ff69e629b33250afa186dc43a0eaf8edca",
+   "3392d1ba1c25905c7336667bca1aa61330e4ad55",
    "testharness"
   ],
   "mixed-content/beacon-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -646729,7 +646739,7 @@
    "support"
   ],
   "mixed-content/beacon-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "aea84f71e64fbbc39230a6ff6804996ec93983fa",
+   "5ea4cd975702e1a916f070fff8c66f8c9270f86b",
    "testharness"
   ],
   "mixed-content/beacon-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -646737,7 +646747,7 @@
    "support"
   ],
   "mixed-content/beacon-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "83d425c58ebba968afb68fe6087c1cc5061906b3",
+   "2ea1e3729f7ba33ac3c7631762a9a127cb294807",
    "testharness"
   ],
   "mixed-content/beacon-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
@@ -646745,7 +646755,7 @@
    "support"
   ],
   "mixed-content/beacon-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "728e6ce73ff25f30d355e3f752262b2e63e93aeb",
+   "89d7b827a4bfb20e69ffb361b044af446fa87170",
    "testharness"
   ],
   "mixed-content/beacon-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
@@ -646753,51 +646763,51 @@
    "support"
   ],
   "mixed-content/beacon-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "4753bb3208d266193d9ae843887bb3b0dd71f0f4",
+   "ac20526946f9386703ea282c70a246f225ef314c",
    "testharness"
   ],
   "mixed-content/beacon-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "e82c6cfdc1883f05ddcf62fc8ce14343d3582ba8",
+   "9cf67c8e15b0afe4de489abd78fbff947110ed33",
    "testharness"
   ],
   "mixed-content/beacon-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "d9c87b30c541275e076e9f9822827a6e5fb82a67",
+   "ce86221c298db6706d3fb6d196adfbe83b0ceeaf",
    "testharness"
   ],
   "mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "2a4f6a5e4593f7495c8931c10e8dfdbdeb1fc3b2",
+   "e331f5772f5b3de11d57b74efe35e474e1fa96b7",
    "testharness"
   ],
   "mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
-   "6b9d9b4f82668087661c12f749b7b247e5b3e684",
+   "bb5d94c95e74976c7fda7127bd55e24e13c5c649",
    "testharness"
   ],
   "mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "a3f302ae60b876a3fb6e2bb5a886fc03311a759f",
+   "f3cddf53e74de9b137bbc668cd45a6cddf319b69",
    "testharness"
   ],
   "mixed-content/beacon-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "0a507e5b109638a49e348f87b3cd1b42856384ef",
+   "ccbaeb971ecbe22df77751ba5e4f5924e790c61f",
    "testharness"
   ],
   "mixed-content/beacon-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
-   "5375ae50b97e618baccf4421834ef7ce8ae41a8f",
+   "6b0daa222412bf1d190e77a9d42cfd7ecece873a",
    "testharness"
   ],
   "mixed-content/beacon-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "c6afc29050c038fd925374f527e992236e0ce739",
+   "adffe353e34409760eb212c9e3bd03d8c3a9ca7b",
    "testharness"
   ],
   "mixed-content/beacon-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "2b83f31198b1808ea577e21d45de3d5e024a41d2",
+   "f0353c39fc757752a93b4b17cd733e1d5e1a7c4c",
    "testharness"
   ],
   "mixed-content/beacon-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "efc6ce6881d38b80be1b5daa67b2d8c5c338b53a",
+   "2cfc38016f2103ebc7ee6964fc442c408cb8bbaa",
    "testharness"
   ],
   "mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "a6c8fe82b59ed5a908b6c4faa5b38bec85906c5e",
+   "af17b7ebd7f91dbcadd0d2362eed14d3acea9069",
    "testharness"
   ],
   "mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -646805,7 +646815,7 @@
    "support"
   ],
   "mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "035904520990a2bfa75bff3e7f1d1cb9fb82097c",
+   "2fff8e851a3de3eb3947909621740fd3e02f313a",
    "testharness"
   ],
   "mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -646813,7 +646823,7 @@
    "support"
   ],
   "mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "3772f3b64ae282f59f82bd5f85509b3668370747",
+   "d654f3b89e01c783e4da50760b1b5a60106d8db7",
    "testharness"
   ],
   "mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -646821,7 +646831,7 @@
    "support"
   ],
   "mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "92d7db06f96e0b76baa16c32bfd51908309a9461",
+   "af004635d1dcdd810bd873c563d4cd044d275830",
    "testharness"
   ],
   "mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -646829,7 +646839,7 @@
    "support"
   ],
   "mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "bd51356e2f9a22a27f9dde778fdd33ac4bd9eb3d",
+   "bd45fa9035b3e13d91069c5ce1f0e65f01eb698b",
    "testharness"
   ],
   "mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -646837,7 +646847,7 @@
    "support"
   ],
   "mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "51b84997e39f97d62ec8138e75924a35999aacf8",
+   "6258bc9564d6449b80291f5b9d041d475802670d",
    "testharness"
   ],
   "mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -646845,7 +646855,7 @@
    "support"
   ],
   "mixed-content/classic-data-worker-fetch/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "eff7b592dbb1406ebfa564f6e3a437f2949b6123",
+   "ce000b18cfa98cba669d8b20db500fde19279dda",
    "testharness"
   ],
   "mixed-content/classic-data-worker-fetch/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
@@ -646853,7 +646863,7 @@
    "support"
   ],
   "mixed-content/classic-data-worker-fetch/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "1b7257dc861219b2a48b7ee7c649848a5ca4790d",
+   "84342c0289070f096b6bacdf6c39e08d0d3a1cda",
    "testharness"
   ],
   "mixed-content/classic-data-worker-fetch/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
@@ -646861,51 +646871,51 @@
    "support"
   ],
   "mixed-content/classic-data-worker-fetch/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "b3bb1383564f43ce32f02eaea719e3d23532a357",
+   "d77d38640b9725f01dc7597c17337d9629017a80",
    "testharness"
   ],
   "mixed-content/classic-data-worker-fetch/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "eb3b0a9eb5110d74d501e93d0ea2ac74ab7d6595",
+   "433477730362e86e665bbccfa91c98b6458c65ba",
    "testharness"
   ],
   "mixed-content/classic-data-worker-fetch/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "9c7b75354009f000b662800be90ca631e94a75f2",
+   "1de38b5a7a14f956437c6d91ab02cdd8916d87b5",
    "testharness"
   ],
   "mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "61288bb8c772fe96846369f44953b6205eea7dfe",
+   "6b811116fbd47f7440726e1f423bd4c8a7506cda",
    "testharness"
   ],
   "mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
-   "4b326660bbb965156174c18f393d1637962790ba",
+   "35a7e584f689ab32f59e41c75e58f012a11a807a",
    "testharness"
   ],
   "mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "031a3728534a0d9ddff17a46e736de375007c4ea",
+   "e69505d7f07e235be5d6c5d6f4d0587255e59871",
    "testharness"
   ],
   "mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "253234f3b3efa4cbdc3479b4aaac445318ff41ba",
+   "b56a6baa1163d40c83968a92b56c971a8c1cebfc",
    "testharness"
   ],
   "mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
-   "61ef1c2d3bc0b7ebf0394a7a8d4be439905dd75e",
+   "4ae4cb83ae33eaebb5d914cc9450ecd57248f241",
    "testharness"
   ],
   "mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "d4dd6daccf5bc7bfe405221d3bac24a96d3c636d",
+   "919e992cc55787fec471baba08679791c419dc9a",
    "testharness"
   ],
   "mixed-content/classic-data-worker-fetch/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "9b28a62a9a989bde0742b2fa1269f85929aabfe2",
+   "e56db94fa07a492c452e496a6e43df56d9d33b3c",
    "testharness"
   ],
   "mixed-content/classic-data-worker-fetch/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "c1496d038023dc66b083182962b0190cc4ad3bc4",
+   "e5110a44c393aa875f639c9fc555b657e43543f1",
    "testharness"
   ],
   "mixed-content/fetch-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "012bd3540a1a10571942f7b0185d3997eeb4a52b",
+   "a84f29e51b6286ad5426030764e4a9c209818abb",
    "testharness"
   ],
   "mixed-content/fetch-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -646913,7 +646923,7 @@
    "support"
   ],
   "mixed-content/fetch-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "54fbe3a8477b82be858c10472a5d16a9c9cfc503",
+   "4de2f75f02253fa38ac1ad4876a8df846cf810d8",
    "testharness"
   ],
   "mixed-content/fetch-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -646921,7 +646931,7 @@
    "support"
   ],
   "mixed-content/fetch-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "f955545580762077668a5a1ee9deb3eb56c62c32",
+   "3e0fb529f04f8cd84118f3b5f08a7d7dfe76b5ec",
    "testharness"
   ],
   "mixed-content/fetch-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -646929,7 +646939,7 @@
    "support"
   ],
   "mixed-content/fetch-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "c03b96f01fa13d9406674212ae79e19cfa0a5be6",
+   "542a1866c79ef5a9b83831ff15d8d77af7083cf9",
    "testharness"
   ],
   "mixed-content/fetch-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -646937,7 +646947,7 @@
    "support"
   ],
   "mixed-content/fetch-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "a7ce2a53055c55c01ef6a173b2d36bfbb9b721fa",
+   "39ccde3c15462ec94d06dfd704843748385fbfbf",
    "testharness"
   ],
   "mixed-content/fetch-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -646945,7 +646955,7 @@
    "support"
   ],
   "mixed-content/fetch-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "1eec54d3b2c8082e7165d026aabc516a43193c11",
+   "4c9d38ea19201d8b7a9fa12913059753578639ca",
    "testharness"
   ],
   "mixed-content/fetch-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -646953,7 +646963,7 @@
    "support"
   ],
   "mixed-content/fetch-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "260fb14b0424d57801f2fd948f099808a33eeb81",
+   "fa4e8f2ac3117cc37e2554e14a6a39096dc110a9",
    "testharness"
   ],
   "mixed-content/fetch-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
@@ -646961,7 +646971,7 @@
    "support"
   ],
   "mixed-content/fetch-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "9b18ebb78b21e69a2aa0f77ad34db83149f09b32",
+   "f05c4b9e694d1522d1deb163217745ba47f90466",
    "testharness"
   ],
   "mixed-content/fetch-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
@@ -646969,53 +646979,49 @@
    "support"
   ],
   "mixed-content/fetch-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "a1b37ef1ee7b1a3f7daeb62308b07435193f9d56",
+   "a1e69a67b9686189d205ee231e4a47bf518e81b6",
    "testharness"
   ],
   "mixed-content/fetch-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "0fb506de19f4e5884521a1c4de5d76c976c68e67",
+   "b9599b28fcc233f57548526f6dcb4c08201a60e7",
    "testharness"
   ],
   "mixed-content/fetch-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "825fb2441b4fc836b570e71fe79785c041903739",
+   "256fca634112f76f7fcffa113956f1f276e45580",
    "testharness"
   ],
   "mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "f35fd03dae8ec43bc11bd848032bae90ececcd16",
+   "1ebe92316fb4f4fd5167f18104c3e2e832615542",
    "testharness"
   ],
   "mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
-   "3b2d158d63176b3035eb25072c79c159aea00b18",
+   "250bbd4f2e75ed15e4b1b6c13ca9d73df2a545e2",
    "testharness"
   ],
   "mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "24a1e8671d88f03739d269551a0046833dc371ab",
+   "98b12d213e1c6674f1ed4e0ac160f4bef09eec41",
    "testharness"
   ],
   "mixed-content/fetch-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "d7aa3899bfaa073f910d188f10629ab359d5bc06",
+   "a63a7940c0a37dfdd3321cbf4c0c5d44984e307f",
    "testharness"
   ],
   "mixed-content/fetch-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
-   "55c768525d1ba650008139791bd3b6abb04a0d4a",
+   "43a6499938c0501bfcb31d914a0908ebbb744294",
    "testharness"
   ],
   "mixed-content/fetch-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "13de80df73c31e44f3ec1659ecb675716dab26c9",
+   "b1534c8777609155fbfbe075781fbd97f7ffc373",
    "testharness"
   ],
   "mixed-content/fetch-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "9045019de11f7b57f1faca355e862f0f22dc4129",
+   "bbc089ba473f0bb36f817c6324ac2d0724e26983",
    "testharness"
   ],
   "mixed-content/fetch-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "d4b8292af3242c70d6449864143843fe4c786d5e",
+   "704042109cce25f023b753bc49cc0a5ff2d93b2f",
    "testharness"
   ],
-  "mixed-content/generic/common.js": [
-   "f1574e99360f456640d0c1a2882a54eb98fce17b",
-   "support"
-  ],
   "mixed-content/generic/expect.py": [
    "2c360c1d9315db12f3463c2d005a111b02b3818a",
    "support"
@@ -647041,7 +647047,7 @@
    "support"
   ],
   "mixed-content/generic/template/test.debug.html.template": [
-   "013bb6250279d9f70155346c0177a6946e5813f7",
+   "77f62ef1da36a4c2f93aa674bd374490de41fb72",
    "support"
   ],
   "mixed-content/generic/template/test.js.template": [
@@ -647049,7 +647055,7 @@
    "support"
   ],
   "mixed-content/generic/template/test.release.html.template": [
-   "ca77389cc682d9099f0428fe97a47c6010f55158",
+   "188e32fde4bc2821776649f47540f7ac86cfdb57",
    "support"
   ],
   "mixed-content/generic/template/test_description.template": [
@@ -647089,7 +647095,7 @@
    "testharness"
   ],
   "mixed-content/img-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
-   "1816b4231bd54b7ee0f38e54eb4dde1a35faf6af",
+   "9b3b46ff01222a47b7b90acba2885741ee5bce8b",
    "testharness"
   ],
   "mixed-content/img-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
@@ -647097,7 +647103,7 @@
    "support"
   ],
   "mixed-content/img-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
-   "509fc34750f8418bd90ecae9ffdcf70a6aca1333",
+   "f39f0c6965316d9e2c0503e2eff1b2f8d298ea4d",
    "testharness"
   ],
   "mixed-content/img-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
@@ -647105,7 +647111,7 @@
    "support"
   ],
   "mixed-content/img-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
-   "61baeee7944a02033a83c86325f19dd03608e0ed",
+   "149d0dc524a74a72ad9bc25b8d5f7eb383c0c86c",
    "testharness"
   ],
   "mixed-content/img-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
@@ -647113,7 +647119,7 @@
    "support"
   ],
   "mixed-content/img-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
-   "ad615e9b23f29764bee97edad62a9f267b1c511d",
+   "d37a441016d4ca9614d140494da38a74a9f5c7ca",
    "testharness"
   ],
   "mixed-content/img-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
@@ -647121,7 +647127,7 @@
    "support"
   ],
   "mixed-content/img-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
-   "b6f92431a3a1a347c7f6ed32d8d58de224bf8f3c",
+   "49d3813b04901f744a74fd5597bc148247380688",
    "testharness"
   ],
   "mixed-content/img-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
@@ -647129,7 +647135,7 @@
    "support"
   ],
   "mixed-content/img-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
-   "580f4b5492f3681e0c908592460bc77bb419f30d",
+   "9787e9c75bf46343bd6d2620d0f6964975817ec5",
    "testharness"
   ],
   "mixed-content/img-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
@@ -647137,7 +647143,7 @@
    "support"
   ],
   "mixed-content/img-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "77adba6442ac54c9c74d2e464e9d77b26238f877",
+   "740e202ce303cea263b85a7d63118314902397b3",
    "testharness"
   ],
   "mixed-content/img-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
@@ -647145,7 +647151,7 @@
    "support"
   ],
   "mixed-content/img-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "b08d413e8ebb74616a9feb46d85c5c9a3a2471ca",
+   "d45384ace0582331b50b6b471564b564086d0420",
    "testharness"
   ],
   "mixed-content/img-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
@@ -647153,51 +647159,51 @@
    "support"
   ],
   "mixed-content/img-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
-   "684d2449a4efe4bd1bd349df4d00e428507761e2",
+   "b1e4649e008cca66197472dc7351c873be33cbbe",
    "testharness"
   ],
   "mixed-content/img-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
-   "b05dff3b33d56dea91f5dee47c045cff6e1ead05",
+   "3c0bce6b72de566b3f4c186023aba22f6e2ad199",
    "testharness"
   ],
   "mixed-content/img-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "e4ac20f4f08954059584b10b09597ef1106465bf",
+   "cc943fd1b5014b99a4a9e8e6396bf734c7dafb8f",
    "testharness"
   ],
   "mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
-   "5a7bdc3b538ffa83347eb7440028cbeefa81c3cb",
+   "8cc7a82c3e86871947d56de05d241677cf522386",
    "testharness"
   ],
   "mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html": [
-   "6c0a9f5e6865b79e0fe871b65094f8260426b53f",
+   "fae9b1e4d7086721678b96a645684e638be7525a",
    "testharness"
   ],
   "mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
-   "c9ffbfd0c70754fef57d39d43155b564b53ddfb0",
+   "9273ac43c49fbad1c28fe443fb171b1f5e12f281",
    "testharness"
   ],
   "mixed-content/img-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
-   "aab662fc3ab3efd1443dc99d98b4bef78c58313d",
+   "030de7033a7c909bacc61b2151d091693610555a",
    "testharness"
   ],
   "mixed-content/img-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html": [
-   "6f0a8fdedefbbe771401833b33e884ec2b9a9a1b",
+   "c9c20812db2f79fb27d97439d980f1f1c7656ba2",
    "testharness"
   ],
   "mixed-content/img-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
-   "f55cce4371339dce41e60a40ebaa909434358bf8",
+   "dddd339fb0347ac089e873a29acfff9e17a78988",
    "testharness"
   ],
   "mixed-content/img-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "54bb60accf14f7c0519b98d6f92db8694805e097",
+   "3e78d29d5aa9cf7d1dbb07e2ce08fe9671d6a4d9",
    "testharness"
   ],
   "mixed-content/img-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "26d7d2390aee53f14924c932e17ff58d7ea57fc1",
+   "5d5e55ed578ebd16ffa4b7eab5ba0b1d238229f3",
    "testharness"
   ],
   "mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "7376626e2e1982384c93ac018d077750da58f700",
+   "482accfd3445c9dc71b01f80440705d7d0be7d2a",
    "testharness"
   ],
   "mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -647205,7 +647211,7 @@
    "support"
   ],
   "mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "fc123d9638d8933648a98fb282528ee8a0329607",
+   "4db97176aa9394178ab6a6842010f1b3b9d7c559",
    "testharness"
   ],
   "mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -647213,7 +647219,7 @@
    "support"
   ],
   "mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "f7fd32cbf9bf9c71ca37834e1adde743e511dee0",
+   "90aa192e60559fe76ffc7f90c8b26131d2ed96aa",
    "testharness"
   ],
   "mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -647221,7 +647227,7 @@
    "support"
   ],
   "mixed-content/link-css-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "b93d177842299eef04c5751542985ea7fdca7c0f",
+   "3a8c8cfa9837214b0ca0f57f210c3e77a9d28150",
    "testharness"
   ],
   "mixed-content/link-css-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -647229,7 +647235,7 @@
    "support"
   ],
   "mixed-content/link-css-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "b23f9f0eb68c94fbeaf67bb9a77fdf3e37b660ed",
+   "a44839fb874f2972d0654351f20ce498892a310e",
    "testharness"
   ],
   "mixed-content/link-css-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -647237,7 +647243,7 @@
    "support"
   ],
   "mixed-content/link-css-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "122ee404dc7496831236cb7fac9f91eb173f91b1",
+   "7a8949053efb49eb262658cfc29f24487dec0e14",
    "testharness"
   ],
   "mixed-content/link-css-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -647245,7 +647251,7 @@
    "support"
   ],
   "mixed-content/link-css-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "606887e3dd529aea3740fc7249ec8f39199c2da2",
+   "585b54c738b9dbcff980a463ba68a146f6db3169",
    "testharness"
   ],
   "mixed-content/link-css-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
@@ -647253,7 +647259,7 @@
    "support"
   ],
   "mixed-content/link-css-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "2f4f750de9fc3538c0cc5b73e9d745836fbb497c",
+   "d6166d041af6101a37e7ffb4cbedbd7df9c06144",
    "testharness"
   ],
   "mixed-content/link-css-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
@@ -647261,51 +647267,51 @@
    "support"
   ],
   "mixed-content/link-css-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "191b4a9ea66404441c6903b026bb1d813951a710",
+   "9b6036b96a556b7fbe5cd23924a44752cec4cd10",
    "testharness"
   ],
   "mixed-content/link-css-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "5e71b99d4c61bfb1962c2f2f3a11dfb90195fbd8",
+   "dc18ca79c36bf9f95f7adac75add66859d401756",
    "testharness"
   ],
   "mixed-content/link-css-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "869c05abeca09f64798294e245ca0c429a5d8ec0",
+   "5e74a770db8d8c5758b1317905a55f40ce94f02d",
    "testharness"
   ],
   "mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "13c536f3eb58c0ae4bdd32ee604d97f54af5be38",
+   "e6b3dedf6a9df07df214d4c61044c9ebb3bfcf10",
    "testharness"
   ],
   "mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
-   "e941030043ee499603d6b9ee709593bc499d19d3",
+   "88f21d4bbff70c80e85ed598f4c03cba90a3e567",
    "testharness"
   ],
   "mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "c9efe54e44a74ae0894f2f46613171f001568c69",
+   "ebd1747a8ce8768d984d1bd75a9e28336fb082fb",
    "testharness"
   ],
   "mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "11d8f4877a760b14d7dd72eddcad89a2c94e7d5c",
+   "76b18d6f7e03d28d4f6b788cf03d9c6f27a936c4",
    "testharness"
   ],
   "mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
-   "ce383d9aacb9605e86de85fd34b14561d50157c2",
+   "4449e58c1b673a903d9ef461580b65b66129ece0",
    "testharness"
   ],
   "mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "67b58e0096ca6d3fc878e75f5d5efb68028e6ef2",
+   "1000359b175bf5910e127ce20ca3aa8abcfd5335",
    "testharness"
   ],
   "mixed-content/link-css-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "7d620f8da936860a456be52c7ef089b23b9f774e",
+   "e07e2fa5b41eabb3411f05dc48d960da67a13cd1",
    "testharness"
   ],
   "mixed-content/link-css-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "f6d23405dd5e7f8907d77b26541a5172cac4f54f",
+   "cbbfa0723d4c6460e038657d5388056a8cc8ceef",
    "testharness"
   ],
   "mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "bcb7abb7c0e210edd372b00a50a77d2de6228513",
+   "9f69cae481f5ed1aa1b4bcc2582871748266ba8c",
    "testharness"
   ],
   "mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -647313,7 +647319,7 @@
    "support"
   ],
   "mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "3c6de84218b69e2e425b34b4d6a1641884e94f83",
+   "883cfde572e67efb54e031e5b4f85836e9f52186",
    "testharness"
   ],
   "mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -647321,7 +647327,7 @@
    "support"
   ],
   "mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "1fe904f138a2d1cbfd662577080f22c3f5da1e4c",
+   "13e9b46cac4521659cc2d83016b1a47a963145dc",
    "testharness"
   ],
   "mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -647329,7 +647335,7 @@
    "support"
   ],
   "mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "2db9724a2ebb49efd7c15569998519126a77469d",
+   "a806be7e0f107468f43b441877e037f7fb3774c5",
    "testharness"
   ],
   "mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -647337,7 +647343,7 @@
    "support"
   ],
   "mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "ddad38792d40c06efc0fac25131eee0e38475666",
+   "69cd3b29d5c1f4388c6e0c378d81fa8d42a0a7a1",
    "testharness"
   ],
   "mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -647345,7 +647351,7 @@
    "support"
   ],
   "mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "d2d15b98dce354773df860faea1e9361ee0d3223",
+   "f337745eb43e37732aed9d7b8a4b8dddaa9e5d02",
    "testharness"
   ],
   "mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -647353,7 +647359,7 @@
    "support"
   ],
   "mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "a047941dcd48d385c998ee796b5efeb896c6d5a5",
+   "9e0ab39c5a9d66ce0a42fca56da0515caf2c5d4b",
    "testharness"
   ],
   "mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
@@ -647361,7 +647367,7 @@
    "support"
   ],
   "mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "bd24109afe28c87f39dd30a17ab6661c99b99040",
+   "819b543948da30fe171b787a4cb7b2764c49a598",
    "testharness"
   ],
   "mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
@@ -647369,51 +647375,51 @@
    "support"
   ],
   "mixed-content/link-prefetch-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "16c1e07a50eb66f980b28f6daea1b885015c7cba",
+   "a9e57c17ce11b1bcb32b3ea4053fec1bd0836ecb",
    "testharness"
   ],
   "mixed-content/link-prefetch-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "f3adaf6cec99f5eed9f3533f7d9e70d4d0e409b2",
+   "f2025dcee2a6d570e9e42ad9fc213d56b6862ef7",
    "testharness"
   ],
   "mixed-content/link-prefetch-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "71ef6d359d1be2afbbfe17c99eed3772c8fe0cf2",
+   "b787497cf92a3fcbffbcf45b00b14c4085e9028a",
    "testharness"
   ],
   "mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "6db10199649adae3c25c99d2cd0385e393b2dc09",
+   "9317d5c73a785878737bb3a2d84eb7f972fb1b69",
    "testharness"
   ],
   "mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
-   "5c41820d55d53ec06132a85799f04c8328c9b648",
+   "8dc0000ba7781b179b8879d640b99d60ab781661",
    "testharness"
   ],
   "mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "afa70d38e9635fa75b3d402b4c9c255fe2695bfe",
+   "64042683224fb90147fff3e6caa4916be092684a",
    "testharness"
   ],
   "mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "00241b622cda657763f67ca2f89e201712a7734e",
+   "1655a2eaec69b90477009ff639f74d83890cf807",
    "testharness"
   ],
   "mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
-   "f1be54283e0403df4e1cfe60b7fcd546e9de617a",
+   "a47869e4304e4d98bbf98926613665005fadbdcc",
    "testharness"
   ],
   "mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "bc14146a24be8c6f6cb1f46628b96275abd0cd87",
+   "1359609a6028faf6873b912699221b08c443b02c",
    "testharness"
   ],
   "mixed-content/link-prefetch-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "c3ea33fdb70008193370465525a42acfaf3a426f",
+   "853bd279af52f16de804e6635c24b73ab3a89629",
    "testharness"
   ],
   "mixed-content/link-prefetch-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "4c59111539119b51143b5fa7d9071e238026aa5c",
+   "f450941427d3bd55558042a8c5efde11bdfafae6",
    "testharness"
   ],
   "mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "ae4ebff13cedd09fee7befefd5525a71fe6d4a96",
+   "0d0e79c5624f2bb066da72706a3572fc1736af2d",
    "testharness"
   ],
   "mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -647421,7 +647427,7 @@
    "support"
   ],
   "mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "aa3fc778fc4769953f474d76d10bbbf4a2db0619",
+   "8f09c46e61b0bc0885daa83e6498f03993a2e16e",
    "testharness"
   ],
   "mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -647429,7 +647435,7 @@
    "support"
   ],
   "mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "c9d2d22c8a095447ba7f6ceb7756fb4af42a759a",
+   "77e7aada13c13131c2567e712064f5d625e16a1a",
    "testharness"
   ],
   "mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -647437,7 +647443,7 @@
    "support"
   ],
   "mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "5202090bc564b8823af995daac2dddcf6bce2dd9",
+   "adb8f0711bc47a5759a68f34629b6a3c835ae8f5",
    "testharness"
   ],
   "mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -647445,7 +647451,7 @@
    "support"
   ],
   "mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "2013b19c6b64890492ebdcb7f13c57d2a8f11cd1",
+   "39560f5eb4a176cde427be6de6d8d9bb86db091e",
    "testharness"
   ],
   "mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -647453,7 +647459,7 @@
    "support"
   ],
   "mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "fbe8606d65613214e6971278067f2c2f3bc7440c",
+   "2a3781149b6f4c58164de5236426d26de9ea3aa2",
    "testharness"
   ],
   "mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -647461,7 +647467,7 @@
    "support"
   ],
   "mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "c6c56e0c9f4c7686ff7c0ff311d3b29f01a5415b",
+   "5b8b9ef9570535ac2f44c1226bbfca54d0a12884",
    "testharness"
   ],
   "mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
@@ -647469,7 +647475,7 @@
    "support"
   ],
   "mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "c62ca1208dad25c8271a6214cc5f0e8029b827dc",
+   "ce6e20725289c564ab4a82eec56a083544c641d4",
    "testharness"
   ],
   "mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
@@ -647477,51 +647483,51 @@
    "support"
   ],
   "mixed-content/module-data-worker-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "349a3731fca66bfafadafb354ad332b8793cec0e",
+   "5055e600a12d18acae4bc2f6995c61602bc0b168",
    "testharness"
   ],
   "mixed-content/module-data-worker-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "6536bef9032bb65e98e0c76eb1f4c1a0984bfba7",
+   "f2e537b7854418766ef5532c575419c4aa8e9011",
    "testharness"
   ],
   "mixed-content/module-data-worker-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "9632f6963f3b212827daa01905545f7471a843af",
+   "acb39ccf4950e0738e80813585d5f90c8405850d",
    "testharness"
   ],
   "mixed-content/module-data-worker-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "fde3d3ab49c948ce33de11f8ccbf5fa0ca6908e7",
+   "9adb36a3c7c0ff40c007ee8dd90c42415d42779c",
    "testharness"
   ],
   "mixed-content/module-data-worker-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
-   "4fe1a650df7a17b5f22ac2eaf85bd9797d7e08df",
+   "4124504484e4271f2f2a244fa949d10abe82edd2",
    "testharness"
   ],
   "mixed-content/module-data-worker-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "93d5a1b631bf246e5f5ec92a661cf3339c142b6d",
+   "20133bca312456df342b403d8f21067718615e07",
    "testharness"
   ],
   "mixed-content/module-data-worker-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "2810c3c159bb827e976d39524f89ba29bceabb9e",
+   "29010dfc2b4dd95c80aedf6748fa25f769929334",
    "testharness"
   ],
   "mixed-content/module-data-worker-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
-   "afb1ac17cec58fe6c8ec3e83e57a4035012a21db",
+   "fb989ecc2bd6522d4e8c76181f5c0d538d3ed6c5",
    "testharness"
   ],
   "mixed-content/module-data-worker-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "e54f7ba9618b0775a3c52d0c41a4e46458d688f1",
+   "c4a8417f072f48f1b560c1cdf110ba34870bebc7",
    "testharness"
   ],
   "mixed-content/module-data-worker-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "7791db2e61f7c0e16f45992518d56ffc587eaf6b",
+   "1f734b4618d30c44886f0a115c880bc13d6aa624",
    "testharness"
   ],
   "mixed-content/module-data-worker-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "d50981f6dad51a632d83b56f62d16a060376decc",
+   "4c171710212868ff513387551f49db431e8a1fef",
    "testharness"
   ],
   "mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "65c121204d4fc078c6ba5f897ae80ba40e4e2bc0",
+   "48bd7e27934ec24d6dbf3ff5ee7c6e7f80fc3095",
    "testharness"
   ],
   "mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -647529,7 +647535,7 @@
    "support"
   ],
   "mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "29d56963e7987de3d061c1e3bbf07cfcaeda854c",
+   "905108ca2f94c47abfaf8468ca36897acf6b0646",
    "testharness"
   ],
   "mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -647537,7 +647543,7 @@
    "support"
   ],
   "mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "25bbcf1e9e8a05163c23951d173d40b213af0ded",
+   "9992cf98607dbf761a8d11341bcb4f420283b5db",
    "testharness"
   ],
   "mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -647545,7 +647551,7 @@
    "support"
   ],
   "mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "5d34ff67cc53f856d3f5adea69f7b73af362c274",
+   "895b87587038f07339fe5c0a3f679b4e1d066b9d",
    "testharness"
   ],
   "mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -647553,7 +647559,7 @@
    "support"
   ],
   "mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "347c57cb3a66faf991e4c589a3297c7e47654fa6",
+   "ed488953ce2ea8382868bb3d999abf1f7afabf9e",
    "testharness"
   ],
   "mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -647561,7 +647567,7 @@
    "support"
   ],
   "mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "ab991d2c8d25e2bc2495d9aef99c4f22019b774e",
+   "4dacb3a7c43be79f7983e2a2ec1a9e2d3a67f2b6",
    "testharness"
   ],
   "mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -647569,7 +647575,7 @@
    "support"
   ],
   "mixed-content/module-worker-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "775fcabb1beb8aa642ab5218aadf8d1607e01ae9",
+   "e7e01df2982563c323c6a38ff4221dece455e7e4",
    "testharness"
   ],
   "mixed-content/module-worker-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
@@ -647577,7 +647583,7 @@
    "support"
   ],
   "mixed-content/module-worker-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "6a9a6437c8d1daf2b843e0eadbe7a0cf17c1d046",
+   "1adac7769cd9627ce958f08887205b51577883cc",
    "testharness"
   ],
   "mixed-content/module-worker-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
@@ -647585,51 +647591,51 @@
    "support"
   ],
   "mixed-content/module-worker-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "e873d4a73d12fa1d3e1becf56227ab4ef293cb6d",
+   "bff5398b2634c78f61282ffd621f680b88f16ab7",
    "testharness"
   ],
   "mixed-content/module-worker-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "ee6c6da0c3f66611c0457645f183f6636dcf5e6f",
+   "ac623c71a45401258780e1cc7b76080ddb2dd503",
    "testharness"
   ],
   "mixed-content/module-worker-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "2393202ae06da4689725b1fd10fab939fd5aef97",
+   "ff7b496a197daa0d5d9b22e2b090f4f6252f5fb4",
    "testharness"
   ],
   "mixed-content/module-worker-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "64f777ea3d0477da70d4c977547036df85e91eb9",
+   "fd30ae973e5565e2192c95f9b94538239962ab6b",
    "testharness"
   ],
   "mixed-content/module-worker-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
-   "4950c32ae14fc3d62e320f3f35b976127ed69c03",
+   "2fa81d5b8a43e1e7e58a0052795376b865be9a94",
    "testharness"
   ],
   "mixed-content/module-worker-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "7301b826e84c97e99b65a61833cb776fda4c201c",
+   "7a9a84582d64839c84f6f5a835c5634a691fe64b",
    "testharness"
   ],
   "mixed-content/module-worker-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "b9a59ad493481273578f14704dcebf7e5b1503fc",
+   "4f9e97917714639f209d05de503173832e8b413e",
    "testharness"
   ],
   "mixed-content/module-worker-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
-   "f1d99109db61000faa070dfdb3b2f1b80a67c224",
+   "8d83c1f93eeba6b4ba67ecfc61725d7b7b227a5f",
    "testharness"
   ],
   "mixed-content/module-worker-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "17e86bac43a92b4668b8f16c25f0abf6253d6c3c",
+   "5719538c0fd7ec778875b494bb5ca5d9faaef49c",
    "testharness"
   ],
   "mixed-content/module-worker-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "744ad87bb24fa0c32dafb93e087f24d4efed7320",
+   "16c4d61aaaf6deb89a5074972cb52b04f9da3320",
    "testharness"
   ],
   "mixed-content/module-worker-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "e04e9baeed863aa47d259b3e42174e93dbb47303",
+   "91db1463370877cdf32eb2bd4eea11ef86df0fad",
    "testharness"
   ],
   "mixed-content/object-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "8ebd99b0118ef4ee214bb56a9a1153aef34e0945",
+   "5e710368a6e1bd53e803ba8f7229923deb32777c",
    "testharness"
   ],
   "mixed-content/object-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -647637,7 +647643,7 @@
    "support"
   ],
   "mixed-content/object-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "b7743daa64c8e342f190926f46164c41822754a6",
+   "242569e5bcc86f06b1024c955eaa55832f41ced9",
    "testharness"
   ],
   "mixed-content/object-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -647645,7 +647651,7 @@
    "support"
   ],
   "mixed-content/object-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "3fe162a2f7cb5a8b077d29c709026e4864af3f11",
+   "d2fe8eaa661e874cf9a33bf78b2723d1147d57b9",
    "testharness"
   ],
   "mixed-content/object-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -647653,7 +647659,7 @@
    "support"
   ],
   "mixed-content/object-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "4c43f3aea64713d07a16df82ff6a4f5384d112fb",
+   "4959d44533e2be5581d76499c7f77f86543f5ab4",
    "testharness"
   ],
   "mixed-content/object-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -647661,7 +647667,7 @@
    "support"
   ],
   "mixed-content/object-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "27da8b421be657bcec8a71234864574f7d853f05",
+   "45d70e8185c6e36108ca4240bdbd9b583222d374",
    "testharness"
   ],
   "mixed-content/object-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -647669,7 +647675,7 @@
    "support"
   ],
   "mixed-content/object-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "01df78229ff99b2b4e2426a90a0ef6398a8165d8",
+   "119dda323ef8dfb07deaf716f0e4c97be4b251aa",
    "testharness"
   ],
   "mixed-content/object-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -647677,7 +647683,7 @@
    "support"
   ],
   "mixed-content/object-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "d1be723f15d575191c62b713ac5624aa7037748b",
+   "01cc0998c0ecf07f9386a8d0b19e6d1ecd0b5840",
    "testharness"
   ],
   "mixed-content/object-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
@@ -647685,7 +647691,7 @@
    "support"
   ],
   "mixed-content/object-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "3f8ec136a1c59a784e131587b09bbb036519faa9",
+   "72275f9946225f637c8c7f53380b3fea5e7bcba7",
    "testharness"
   ],
   "mixed-content/object-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
@@ -647693,51 +647699,51 @@
    "support"
   ],
   "mixed-content/object-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "ee5cfea719226d0f0fbe030a841dfb770ecf5cca",
+   "4cba2b547fa1369c0b16966a702f0e03ae310b2a",
    "testharness"
   ],
   "mixed-content/object-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "28fdc6f0887d3f81100aa73fb7b7a000e3b2bdb9",
+   "ea3e1dc4e76745913f3b558ec7e9dc171322d3a6",
    "testharness"
   ],
   "mixed-content/object-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "662ac192a8819519e600e9eecbda9e2aa3d945de",
+   "d8c0fda2bef7e0d8e027192f496a9de81f599600",
    "testharness"
   ],
   "mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "23e6badf7ea744b9967d4a73a087712ab5181d4d",
+   "5ba57440bff7af3e13e83a5cb393b51d59958fdc",
    "testharness"
   ],
   "mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
-   "482024535f9ab51f4851e0ef10687c9ca8d3681c",
+   "414ed3a0e5f4578c718774cfaaa8f2242236b031",
    "testharness"
   ],
   "mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "f91df5037e7f215fbe9b9f7ca922090f64a06f9f",
+   "a9a07e7c68986c0608a30dfa28e2bff7e3ae1390",
    "testharness"
   ],
   "mixed-content/object-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "190b66b0d62c685313e0957a7acca1fbdb02aa53",
+   "36ee1133c4cb83468d0b73984c3a814b9706aab9",
    "testharness"
   ],
   "mixed-content/object-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
-   "c03d5036a385886153df535bc4bf7632b15e63f2",
+   "32bf8286926e6db575a8646d25317b95a3736d3b",
    "testharness"
   ],
   "mixed-content/object-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "d9a1666098166b40d2537ccac30586f195607446",
+   "57d8e55701ff70b67d18d523abc644581603bb07",
    "testharness"
   ],
   "mixed-content/object-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "ebfb5195eb172b0609cef28acf6123da32a496a3",
+   "1fc9bd34247187e1c46fde78ae0fa8be9cea44bd",
    "testharness"
   ],
   "mixed-content/object-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "f5ffcf3a8b2f3aaf6473d8844e6a6fed9479c8e5",
+   "66e4183460ad27035fe265e604ce6a9f7fc46eb3",
    "testharness"
   ],
   "mixed-content/picture-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "6f71158c2160e4ca2634e0d66ae6f0f276f13387",
+   "f4284d2710dd07d2ea2c7475a9c88bcac2e1c8e3",
    "testharness"
   ],
   "mixed-content/picture-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -647745,7 +647751,7 @@
    "support"
   ],
   "mixed-content/picture-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "48012dfe5504829a6f8d3fc0f1417755d84444aa",
+   "81c5e313e1f3e443e3e7c26d531a90634f778489",
    "testharness"
   ],
   "mixed-content/picture-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -647753,7 +647759,7 @@
    "support"
   ],
   "mixed-content/picture-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "b76c48a658af25986695099ed1ee9c0e10d065fa",
+   "423d55b6b9e90ea302e682e7aba4378385a1b1f7",
    "testharness"
   ],
   "mixed-content/picture-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -647761,7 +647767,7 @@
    "support"
   ],
   "mixed-content/picture-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "27e971ac49c1d49e7c4f9120f5261193370ca7b4",
+   "265c22fef5c4bc5aa84814be306a9258a4c800e9",
    "testharness"
   ],
   "mixed-content/picture-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -647769,7 +647775,7 @@
    "support"
   ],
   "mixed-content/picture-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "0fe505a4b05c96d69265632f2717487fb702c5c0",
+   "e78b35af9b7336d559fb27fe2e1df5f96664e3ba",
    "testharness"
   ],
   "mixed-content/picture-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -647777,7 +647783,7 @@
    "support"
   ],
   "mixed-content/picture-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "d066d7f4af16cb751cd03f7cbfe036de9f8946f6",
+   "e71eca9f52103b49c81c9a62313490a6e0dabd10",
    "testharness"
   ],
   "mixed-content/picture-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -647785,7 +647791,7 @@
    "support"
   ],
   "mixed-content/picture-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "3ae09e2e3f31d757b6a61a7c6e75c81f517a9cc2",
+   "60bb06333c80166143d3b6e15d214e57bfbdb724",
    "testharness"
   ],
   "mixed-content/picture-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
@@ -647793,7 +647799,7 @@
    "support"
   ],
   "mixed-content/picture-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "883c0bbdf780c5a56551a21a58cf18a137d2f62d",
+   "082a5d0291754da2a64233f1c48436050959f75f",
    "testharness"
   ],
   "mixed-content/picture-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
@@ -647801,51 +647807,51 @@
    "support"
   ],
   "mixed-content/picture-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "abe50087f63ecebeafa1f539d99ae62856bf0523",
+   "d240025aaaaf179ad50c32bfe07573addd755d48",
    "testharness"
   ],
   "mixed-content/picture-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "9c484e398a2b226b836b6bd3331e994ace23af48",
+   "545858eb23d91f0e90b59bac2ddd1a2e36de990b",
    "testharness"
   ],
   "mixed-content/picture-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "0d846777fab3f9af654fa77144ac29771743ceb3",
+   "1722e18842ae15422b7c6c46af967ec92ea243c9",
    "testharness"
   ],
   "mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "09fadc8d3fb98f66e785b57279640b6d054c1290",
+   "07b58b5e8f1c23eaed9ad3a2f3e568d5a47cca4e",
    "testharness"
   ],
   "mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
-   "63505012881f4d6847c2deac2ea693cf261cc95e",
+   "7cd700532308bfcf504bb53af702579f3f6220c3",
    "testharness"
   ],
   "mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "c3bedd387d718366662a6ced17078124002f086b",
+   "5109e5a031d4d74218df0f3814f70e20c86e9b1e",
    "testharness"
   ],
   "mixed-content/picture-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "0b2a8c8ff5a31ca718446746702f2f38cf220981",
+   "1005c627f67ad8b3f0893a93177bf71c58f2fba1",
    "testharness"
   ],
   "mixed-content/picture-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
-   "532c97bf066cd512c4b5a11caed0334762483e4f",
+   "98bf20f362e791da3740eb45ae5dcf75e1172c82",
    "testharness"
   ],
   "mixed-content/picture-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "662fc90485af68b205d920e0c79b19cfe0be36c4",
+   "a5b1bedb767f4e460309a0fcc765370284953f4d",
    "testharness"
   ],
   "mixed-content/picture-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "57efd6f5ec435c412abfcc9249714b980452fc29",
+   "76580a4deba1158dcdbbc5164678585b066a3215",
    "testharness"
   ],
   "mixed-content/picture-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "e3113a84c9f42dbaff2362a2956e48a9fa9604a1",
+   "7e6f59e33add340e9b3d288a8ff2ce16a217a4ce",
    "testharness"
   ],
   "mixed-content/script-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "61f10dfbff3c457ab88ed4e601a65c5a0ee94b51",
+   "a1c58ee77b0e2913ca0cce48a127b1864abae910",
    "testharness"
   ],
   "mixed-content/script-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -647853,7 +647859,7 @@
    "support"
   ],
   "mixed-content/script-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "69210c6061d86afe74ac959afa4778f62a04e79b",
+   "53729bbbafdc767028991c09897004edfa70ce44",
    "testharness"
   ],
   "mixed-content/script-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -647861,7 +647867,7 @@
    "support"
   ],
   "mixed-content/script-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "a2201a2132a40c4186030b191c0c74b04738fa12",
+   "3f6d76717c0c9821778c2240828a0dcdc644554d",
    "testharness"
   ],
   "mixed-content/script-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -647869,7 +647875,7 @@
    "support"
   ],
   "mixed-content/script-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "011e515da17668df96e748e8663cb8d53590e12b",
+   "c89c2a58c793e6b6a74d8b46e6134b45db491c42",
    "testharness"
   ],
   "mixed-content/script-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -647877,7 +647883,7 @@
    "support"
   ],
   "mixed-content/script-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "5c8d860a695742c8a678473b849c633feb6a3bb2",
+   "84d81d6036616ace866de9747b3518825ee25bdf",
    "testharness"
   ],
   "mixed-content/script-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -647885,7 +647891,7 @@
    "support"
   ],
   "mixed-content/script-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "123e53d2027ffca05daa79805a22b92fd5ebcaed",
+   "83110755a63da18d90a4bf109866da6463063c26",
    "testharness"
   ],
   "mixed-content/script-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -647893,7 +647899,7 @@
    "support"
   ],
   "mixed-content/script-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "cb3528e03c903a64b564fd856c2c8c763f84ac97",
+   "e7b7bd4e5c8a7fe16fbc9789e2c459d2ab386b91",
    "testharness"
   ],
   "mixed-content/script-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
@@ -647901,7 +647907,7 @@
    "support"
   ],
   "mixed-content/script-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "7bffa299c5dd914b6637545b207fab95bac9363c",
+   "1aaa44590e831448e87beb06089b91caa9bac0a6",
    "testharness"
   ],
   "mixed-content/script-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
@@ -647909,47 +647915,47 @@
    "support"
   ],
   "mixed-content/script-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "7e9a2395a3cd228bdd09426868c486c44a036524",
+   "bcb3b05739dfeeeb45e513abeacaf0ad69aa74ee",
    "testharness"
   ],
   "mixed-content/script-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "44b4795c91eb591486c42c776f60a51b3e1bdae6",
+   "c6af6e42c53d24303b594b019cb2052156d71a46",
    "testharness"
   ],
   "mixed-content/script-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "0d0eec01c3667998f6fc501cd74ee035d6b6ab90",
+   "df5aa5228da2e8e5131d55bd74535fcb0aa4dede",
    "testharness"
   ],
   "mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "4c375acd157788d0ea65bfa5d00ebcb4ad1fac90",
+   "d0048db305551954b7934ba3e3d90b09281caf0e",
    "testharness"
   ],
   "mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
-   "21d152557194674f062b51f678d34205330d547e",
+   "a1519d9c2aca31674525075d1607fb91067d37dc",
    "testharness"
   ],
   "mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "cd56451c5e4e75975e6bff3825b378339d209c48",
+   "9e46278e860dcac3a7c84740e3b83a1d0bdc6e64",
    "testharness"
   ],
   "mixed-content/script-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "cc1c051a364f5075e525bb904a7b12e5a6985313",
+   "d92025d3d87ca3719fb136f842dac1142d530509",
    "testharness"
   ],
   "mixed-content/script-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
-   "23efca0a54c18f37f81d516ecf38532716dc9d74",
+   "d84c70e54e3005b46645c7912ee002f162ea3c95",
    "testharness"
   ],
   "mixed-content/script-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "69e151519bb25e47a722d5958cb78e5d557f1d11",
+   "d4ee7953bf7c36a8a4ca7f0b428a746cdb6e6df5",
    "testharness"
   ],
   "mixed-content/script-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "9dc0bb122c47d7c172a8c9290eafde9c9ff0e453",
+   "d8b2161b7c8f039c082f393d18870c547f77c484",
    "testharness"
   ],
   "mixed-content/script-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "bad7e7f21044796d322b1f6dd59b0397edd85ed7",
+   "7b4423bee35da00b8906f25e83ed46f93a0dd3c1",
    "testharness"
   ],
   "mixed-content/spec.src.json": [
@@ -647961,7 +647967,7 @@
    "support"
   ],
   "mixed-content/video-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
-   "029d34c4f4178e488644c546e9f395ec6edef91c",
+   "97d76b32ffe55ab7116a2cbcfb26067d42fefdd6",
    "testharness"
   ],
   "mixed-content/video-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
@@ -647969,7 +647975,7 @@
    "support"
   ],
   "mixed-content/video-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
-   "c72ca267fcbd2098f89d2ef6f0f906965f19c3dc",
+   "6d2d972ef94faf7dc74daf26533adca2b808c3ee",
    "testharness"
   ],
   "mixed-content/video-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
@@ -647977,7 +647983,7 @@
    "support"
   ],
   "mixed-content/video-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
-   "b50a7b70a01c11836b23104023df5c52fe856398",
+   "912f59015641604e8b48fc950b0d01e7d20f525f",
    "testharness"
   ],
   "mixed-content/video-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
@@ -647985,7 +647991,7 @@
    "support"
   ],
   "mixed-content/video-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
-   "8b64104bd2f2b7e39a202718ec562239abec5918",
+   "a0957ec2cfc315fad8924bc6db3b37e035150fc8",
    "testharness"
   ],
   "mixed-content/video-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
@@ -647993,7 +647999,7 @@
    "support"
   ],
   "mixed-content/video-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
-   "abe3385b06a730f019cc98ec51008529a25a48cd",
+   "a01f53a05714e6e5c45e5aef112ae1f7080f2ad2",
    "testharness"
   ],
   "mixed-content/video-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
@@ -648001,7 +648007,7 @@
    "support"
   ],
   "mixed-content/video-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
-   "78d9f8d5d4e2080e67b2b839833cf588c2050e5b",
+   "fb3b6344bc44623e29dcf1ca777f9edb625dccc0",
    "testharness"
   ],
   "mixed-content/video-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
@@ -648009,7 +648015,7 @@
    "support"
   ],
   "mixed-content/video-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "ce72664408e0246dc4798bcc8a651b84a3d0876b",
+   "8bd2c9f602131245ce20ad7807484508057d78e3",
    "testharness"
   ],
   "mixed-content/video-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
@@ -648017,7 +648023,7 @@
    "support"
   ],
   "mixed-content/video-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "b9ddc78ff18c7fc9c35405d65b5112036431ac08",
+   "94a5e8e640192c36fe9f3eefd7fa1fcc2d153325",
    "testharness"
   ],
   "mixed-content/video-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
@@ -648025,51 +648031,51 @@
    "support"
   ],
   "mixed-content/video-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
-   "a181ecd388a3b2dd807b9e020338e72612e02dd6",
+   "5910d534508f84083b5a08615ed59754bd46a7a0",
    "testharness"
   ],
   "mixed-content/video-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html": [
-   "05f1890c98ddf4596d53e465c8c8e11fa180907d",
+   "44fb60208295464efc1d99fc3857353de313fb71",
    "testharness"
   ],
   "mixed-content/video-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "cf84396315ef2800c9e4677b957cf41a713e1358",
+   "1cd1855b2ac5d510d27f436b2dc5ca7e25ea94f6",
    "testharness"
   ],
   "mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
-   "561a2f7c1b5fa1069d649f742e0ee2b8262bf004",
+   "48687c66ba9816aa5902add40485ce6a34ed77b2",
    "testharness"
   ],
   "mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html": [
-   "e02134b4acfe6eb35a9486530a904ad943237263",
+   "e39519b4bc856899fcba23a652131ed13bbd6f85",
    "testharness"
   ],
   "mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
-   "f90575c137a6ae69ea78e2673c31d69999dc0b20",
+   "1075bb4110fe2bf722c77e3f9b04edb1ecd17844",
    "testharness"
   ],
   "mixed-content/video-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
-   "68bfc2b84a81b51b77083e777d8d307bde0d3a51",
+   "e97fcd5278a8a7716de29c64614e916fe4223e24",
    "testharness"
   ],
   "mixed-content/video-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html": [
-   "2e5eff5a74efc3190062df98b56a7139f2c85395",
+   "e74ae75d66f7217176851184a5b4b8a891f07cd0",
    "testharness"
   ],
   "mixed-content/video-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html": [
-   "8c5bd7b080619ee6967ba75b205aaa51b192e0be",
+   "eaaf53bc36ac0ab092b3db0f46240ea5dc1f5f5a",
    "testharness"
   ],
   "mixed-content/video-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "f044783e62ba264cf29a47221c9f63ee9b7f3c29",
+   "399566ff204af8a4883ca42f0d5e6e11e565f388",
    "testharness"
   ],
   "mixed-content/video-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "fd0a1f923a7850cc6335ce074b57b90395d5a7ef",
+   "2b51bd4cf89679eb48bdeb02efbb3c101eb69437",
    "testharness"
   ],
   "mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html": [
-   "5f4facece9f5ec53fac0f82c74b4f1243c2a3b95",
+   "4f52562fa8f1508bf04540592eeda051071a97bb",
    "testharness"
   ],
   "mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html.headers": [
@@ -648077,7 +648083,7 @@
    "support"
   ],
   "mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html": [
-   "0d700202fcf8b606c892aa614c32c936beba2784",
+   "20fc9b91116f2726b58dcaf639030371237970d2",
    "testharness"
   ],
   "mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html.headers": [
@@ -648085,7 +648091,7 @@
    "support"
   ],
   "mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html": [
-   "22e930e20b4b9a8930a26a9ebac843a6135eb5f2",
+   "3a67d126dc6c23f59cef0bf8479bc33c8437a711",
    "testharness"
   ],
   "mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html.headers": [
@@ -648093,7 +648099,7 @@
    "support"
   ],
   "mixed-content/websocket-request/http-csp/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html": [
-   "972d7f3d34944b6d50a3b674a622d5cc2e30c189",
+   "0b1702a56e95ebb96fdb6d1df63247127ae8832d",
    "testharness"
   ],
   "mixed-content/websocket-request/http-csp/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html.headers": [
@@ -648101,7 +648107,7 @@
    "support"
   ],
   "mixed-content/websocket-request/http-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html": [
-   "66b20800ffa6eb3164bade8a82bf06e8ef0f8cae",
+   "087f54d287cba73e0f9dac22c4fea78fb29774b3",
    "testharness"
   ],
   "mixed-content/websocket-request/http-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html.headers": [
@@ -648109,7 +648115,7 @@
    "support"
   ],
   "mixed-content/websocket-request/http-csp/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html": [
-   "664acc6fa8ef6cfc52083a79ccd6760c99b8fa8e",
+   "2491c53841857272d969f1262bcd1a03ab8f834e",
    "testharness"
   ],
   "mixed-content/websocket-request/http-csp/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html.headers": [
@@ -648117,7 +648123,7 @@
    "support"
   ],
   "mixed-content/websocket-request/http-csp/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html": [
-   "ff33c35d16982635cc9c542c772a86e4f1abea78",
+   "727cc350f4a25b4799342c9f547b30d3548ea442",
    "testharness"
   ],
   "mixed-content/websocket-request/http-csp/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html.headers": [
@@ -648125,7 +648131,7 @@
    "support"
   ],
   "mixed-content/websocket-request/http-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html": [
-   "dabaab28cd62017c1e6588f44e503d009cc874c0",
+   "5a10108a5d892e9057aa6a14008e71ad4d7b2ae0",
    "testharness"
   ],
   "mixed-content/websocket-request/http-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html.headers": [
@@ -648133,51 +648139,51 @@
    "support"
   ],
   "mixed-content/websocket-request/meta-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html": [
-   "1bc4b11d9a704b241dbdcdfc1eef824dd614975f",
+   "f2e2642498215498c7035e2f0abdd60f10ebdb8b",
    "testharness"
   ],
   "mixed-content/websocket-request/meta-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html": [
-   "a3cb304e034f8341900f5b8024f9f4d4c0c767d3",
+   "e9442970783d6b1f0780ac16113eaa2ef6c2ca19",
    "testharness"
   ],
   "mixed-content/websocket-request/meta-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html": [
-   "f1cfed1984c653586b40c3f09b37ce84fd7240a0",
+   "45bf7d3bb213cc1700bdef4b6bde621cb3c95e6a",
    "testharness"
   ],
   "mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html": [
-   "ef959099b113a4dff84573575383276f7823ce06",
+   "049e61b1ded901af8ecb0282a2ae2c78bad45e8f",
    "testharness"
   ],
   "mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html": [
-   "9a344137bb9623a95443cb8425d3087247add271",
+   "2a282084a1de4b9d2a457dd4a59c16ae37d899cb",
    "testharness"
   ],
   "mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html": [
-   "fad857a6ee1c4b34be670cb1a46d2e2f0eb28ec2",
+   "099056fb25b7f3c430a5258008402ec36f23e692",
    "testharness"
   ],
   "mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html": [
-   "cc63690459aaebf3867785ac7e5130e41ba45df6",
+   "c24e1d7ac99bd40eb7eb2af0cf07077ad0df2598",
    "testharness"
   ],
   "mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html": [
-   "4b7ae62fd4b2398f21772bcd7a2164378ec4c9fb",
+   "83120667aff098624ffca28ba3078c2bcc6b974e",
    "testharness"
   ],
   "mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html": [
-   "278819b938f692a92b958c91b74cfea66b1bbd2b",
+   "5fb923f2b5e2d88a16bf79d4d8fd339eb22dabc8",
    "testharness"
   ],
   "mixed-content/websocket-request/no-opt-in/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html": [
-   "52684b1a5015fdcc2ca99bedaf21bec8ebd62167",
+   "09fd3e4259e751c2822e29a4261f60931dd27938",
    "testharness"
   ],
   "mixed-content/websocket-request/no-opt-in/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html": [
-   "a32429b8866c5a912540ca6e98226dbb4f4fff43",
+   "4e104fb8519fa1b985e43056a2c1bbbb361cfb08",
    "testharness"
   ],
   "mixed-content/worker-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "8fc3283a0acde7db2af7c31026a8955da4cedf7f",
+   "3b1be17ec596604e3bba1378a4fead28de6bc8d9",
    "testharness"
   ],
   "mixed-content/worker-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648185,7 +648191,7 @@
    "support"
   ],
   "mixed-content/worker-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "21f63bd7307400dbdbb3c5fb4bbe5a5d22a5ef1e",
+   "e5c5a860341549c49a6c7ad31d2d2b15b26ce35a",
    "testharness"
   ],
   "mixed-content/worker-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648193,7 +648199,7 @@
    "support"
   ],
   "mixed-content/worker-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "d4c437147aa3adf643688e72a04db3d9b4d033bb",
+   "f318d00b762d0760c280a65151f087c383ae20d2",
    "testharness"
   ],
   "mixed-content/worker-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648201,7 +648207,7 @@
    "support"
   ],
   "mixed-content/worker-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "735c267a88a82a7ada24d1707e18a12a570c9f79",
+   "1e133c2a8ed340c9374c7deb6a6643ed29eb52c1",
    "testharness"
   ],
   "mixed-content/worker-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648209,7 +648215,7 @@
    "support"
   ],
   "mixed-content/worker-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "d70b857689740a0142b4f9001783fb9ece7b965a",
+   "1d7c1ec1c4de362a8dbd46dc7c1767e63c41b7c8",
    "testharness"
   ],
   "mixed-content/worker-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648217,7 +648223,7 @@
    "support"
   ],
   "mixed-content/worker-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "bf77ac6d77ef0b8463000d99dff11c68e219333a",
+   "3e31998cb632fc7286c6da67468f6185ff10bcf1",
    "testharness"
   ],
   "mixed-content/worker-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648225,7 +648231,7 @@
    "support"
   ],
   "mixed-content/worker-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "1a9053e4c3eb23d995550a31db8c3468c61dcebf",
+   "2fa9e6b3f6d97b6ca3879d3ef820e2c029f7b249",
    "testharness"
   ],
   "mixed-content/worker-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
@@ -648233,7 +648239,7 @@
    "support"
   ],
   "mixed-content/worker-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "0488b133755097e9fb20f55dfe61e07ba7c49cfb",
+   "c4651834b12903b5fa7480d3f7d3ee027d277bd9",
    "testharness"
   ],
   "mixed-content/worker-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
@@ -648241,51 +648247,51 @@
    "support"
   ],
   "mixed-content/worker-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "63ba904540373c412ca3491d0e0c24908190e8ed",
+   "140133fcdfe410f14156e91a7a7f586135dec63e",
    "testharness"
   ],
   "mixed-content/worker-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "22e7c6eac283343a6b75ec82f8f0913425178c4c",
+   "f664dfc3007065ddec1adbfa6d4eb438a239f2df",
    "testharness"
   ],
   "mixed-content/worker-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "e5bf5ce95a8226764c0731af2cf7d3e2becc3500",
+   "f639f30ee341201ec30c2f1bf7e6c7d7eaeedf4a",
    "testharness"
   ],
   "mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "4feea4b7dc0a8dae64e992465f929f71822db47c",
+   "7a8df78728cfa3f7cd417a993c1ef7a9fd153132",
    "testharness"
   ],
   "mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
-   "2d4f15b13e202a6423f162c87fa4dc27ead8eba3",
+   "99162059a7e1a7ba2a7cbad35bd526e37a0f0253",
    "testharness"
   ],
   "mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "a6782c7e5b88ec9a59d22a4f5d44ce58d019cf28",
+   "5b69f15948310f519d93c9a5b210ec8eb4a38492",
    "testharness"
   ],
   "mixed-content/worker-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "065ff5ba526da3c50977852b2dbf29a28b57f54f",
+   "f6bad6b76b752ee4d249c41ec1847afb1a1abf1c",
    "testharness"
   ],
   "mixed-content/worker-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
-   "3cd8a67482ca4fd67ceccc93d59ce76f2bfc93e4",
+   "e2f8a28561ad6fa98ba7f2d8f267e32fb7ebd770",
    "testharness"
   ],
   "mixed-content/worker-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "3b3e17c27774517b69a7760568395ff2df413d23",
+   "54b34e77788e9fe6f44645e6c3d50c3c69e08804",
    "testharness"
   ],
   "mixed-content/worker-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "d720fc4fa993a7384760b8a23fb8f3fc6d4f73c1",
+   "a277471b5d062e31571ef64c8757e8210acc80a8",
    "testharness"
   ],
   "mixed-content/worker-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "bd69a14a9dee83efd7fc0d70ec2c061a6597e29e",
+   "db091027140cbaa22ccd79772470f4e711dffe22",
    "testharness"
   ],
   "mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "99c2795851f6ff97e3e9912cedf545ab36487007",
+   "1db0a1e4436e7446e8dadad3ceea926fcfdcfdcb",
    "testharness"
   ],
   "mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648293,7 +648299,7 @@
    "support"
   ],
   "mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "ea193eadbb0a1918966ffcc362ea6ea743d27cb3",
+   "30cf903d12fcfd16daff32be00af6d54968c1653",
    "testharness"
   ],
   "mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648301,7 +648307,7 @@
    "support"
   ],
   "mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "f410e1cf8e8bc0fa27040b0cc97bc1820494417a",
+   "8840673a63024d3ea6a70b77436a0e458fbe4f3c",
    "testharness"
   ],
   "mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648309,7 +648315,7 @@
    "support"
   ],
   "mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "cfda98f785f15bc37918a4da640ed53cdc776700",
+   "fcb3ed1f3af2730f703a720f55d5f2d47726cd07",
    "testharness"
   ],
   "mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648317,7 +648323,7 @@
    "support"
   ],
   "mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "a85242a83345971e145eae86fb9153a50372c08d",
+   "e97d9ed90520552a8100dd56879abfcca87c2531",
    "testharness"
   ],
   "mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648325,7 +648331,7 @@
    "support"
   ],
   "mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "48d74bc30817ad37f6a85c985b91e2f87754cd41",
+   "b9e6af0d6b3eb1c132e996118be5d1ea5689ca02",
    "testharness"
   ],
   "mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648333,7 +648339,7 @@
    "support"
   ],
   "mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "7d0cdae613eece8ba3b267a3016b9ed95590b395",
+   "79ace7792930d23ad46859031c9eac0e6cc1bb14",
    "testharness"
   ],
   "mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
@@ -648341,7 +648347,7 @@
    "support"
   ],
   "mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "94f97850ea7e9a66c6808b4ad0496ccec013ede7",
+   "3a41ecf140b52b10dc9d12dbd52e9e4464dc9a1c",
    "testharness"
   ],
   "mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
@@ -648349,51 +648355,51 @@
    "support"
   ],
   "mixed-content/worklet-animation-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "1a895d0fd70a5d6d24c4b3bd49e0a60db4275e43",
+   "9bf5482526add89390a5975cd4eb0dae018c0aa4",
    "testharness"
   ],
   "mixed-content/worklet-animation-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "ab90656e54ce2f2459a1c4e82ff06a3a46e64f8c",
+   "a7d02739da227ecbe9fe1529cf6b7e7cd7dd653e",
    "testharness"
   ],
   "mixed-content/worklet-animation-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "113460364e35acd4bed4b591ed82f2579bac0175",
+   "2e7aa07099090093c980d72f0da9023d21395a91",
    "testharness"
   ],
   "mixed-content/worklet-animation-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "a636eef658b909f9a72b554d574783f26aa9d176",
+   "4a97df5b5bab0fbbbdba16836a41ca806b541e65",
    "testharness"
   ],
   "mixed-content/worklet-animation-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
-   "8aa7d05881f0a95f2e553c011ce508b382b0ba9a",
+   "0358e5fb6bebcfaaf55e3ee4b7cd824866b79184",
    "testharness"
   ],
   "mixed-content/worklet-animation-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "5ef502f0c29f8189e0c6e250cd6b0189c551e2c4",
+   "d59023de3847c1327119cd28888268bb63f8c681",
    "testharness"
   ],
   "mixed-content/worklet-animation-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "34b6be42bb5ef26330b92944b50be0fcc23c05de",
+   "13e9150460b21591f74950adcadd5df6125e90ec",
    "testharness"
   ],
   "mixed-content/worklet-animation-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
-   "1586df97fc5af16dcd3286ccdad1dc39638095a7",
+   "84b53d8f1ba92fce5bf6466d5f31c39312b417d4",
    "testharness"
   ],
   "mixed-content/worklet-animation-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "73f621edff11c115e5fa8a11ad73598e27fbde5b",
+   "4b6dc464b46ae6dad73f43ce82593627be1f2d83",
    "testharness"
   ],
   "mixed-content/worklet-animation-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "2b32f598852c15ead544b7d37022807dcfd9bda5",
+   "ad35a459266b4fc1ef05ee83751fe1ceecd830b7",
    "testharness"
   ],
   "mixed-content/worklet-animation-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "35995bb976f0f8211b2121ef5726dcbb54ab625e",
+   "2ca7129d2eec2420226f35301c847d36a17f256c",
    "testharness"
   ],
   "mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "c858da0c4b60ff29747ce9e915276cc647469710",
+   "3ca94248773ab57aeb87b1115631a19fb529664d",
    "testharness"
   ],
   "mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648401,7 +648407,7 @@
    "support"
   ],
   "mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "0387b165e1b7fd435d927d3dc37db4f540408cf8",
+   "0ebfe517fd1b51dcc7e31b2439edd6257621203e",
    "testharness"
   ],
   "mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648409,7 +648415,7 @@
    "support"
   ],
   "mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "34a4e1e532aae2644d64daee7bd785e5b4c40317",
+   "85f339a461fee4d61ae3e27b9d5ce1b86d31cc74",
    "testharness"
   ],
   "mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648417,7 +648423,7 @@
    "support"
   ],
   "mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "b683d8267eb6fb2b7ea6947434186b37c6389e75",
+   "2ff42bf27e786d77d690982671993d1f61728b21",
    "testharness"
   ],
   "mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648425,7 +648431,7 @@
    "support"
   ],
   "mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "5655510609ffb7f3c39b6bbbf48cf2b2982895d9",
+   "3e0fbbc958521564401341635c5f10c300ebb009",
    "testharness"
   ],
   "mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648433,7 +648439,7 @@
    "support"
   ],
   "mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "0ccf4bc4229c5150a5ac82594c29e34479260cbe",
+   "b12e3d7fbe2490739e3bde39730080db6725f915",
    "testharness"
   ],
   "mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648441,7 +648447,7 @@
    "support"
   ],
   "mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "7c54048c0a9cb68a83c0371775fb7a7686bd75b9",
+   "3877b4adf8c57082f2a8400677a4db589dff8a5b",
    "testharness"
   ],
   "mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
@@ -648449,7 +648455,7 @@
    "support"
   ],
   "mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "2d3eb78d6186e411f56ce651fd441d2a77803ff0",
+   "1aeee584cff45e4d230ecdbbc89e53c16ffcac0b",
    "testharness"
   ],
   "mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
@@ -648457,51 +648463,51 @@
    "support"
   ],
   "mixed-content/worklet-animation-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "989f1ad507802cf299f70a51b7f45bf1f1264dcc",
+   "f96210c1198f2f37e6996a8cd6a82b98a02aa8a4",
    "testharness"
   ],
   "mixed-content/worklet-animation-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "46bca306999c4ba0865a3343e9786d0ee42ffdd6",
+   "86e8c0c4b5e01f062867df308997c10b365e11a3",
    "testharness"
   ],
   "mixed-content/worklet-animation-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "313f7755b48205a19b2370e571311771603a72af",
+   "ef94f6df86a2e19ab6a595ce8d604cf3c11c9728",
    "testharness"
   ],
   "mixed-content/worklet-animation-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "033b1d9798f0967bae1204aab8216237fb45fc1a",
+   "557f3f78e3bb31a2d42abe8bd5f104a3230fc9f9",
    "testharness"
   ],
   "mixed-content/worklet-animation-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
-   "c4d4629746b36b8a5b49f6f02cb68333094a0f2a",
+   "f9dd0619e04ec7950b2321237d53271c142b9f28",
    "testharness"
   ],
   "mixed-content/worklet-animation-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "90ad6006617bc7e947c49032b2c8fd448529838a",
+   "f6e6751ed4824570ce440ea2be1b900b175a3423",
    "testharness"
   ],
   "mixed-content/worklet-animation-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "5111667254f67dcc684a7d8610699dd423429aaf",
+   "2b1b0b2d913bfc20905f79921a4d9ef3695ffd21",
    "testharness"
   ],
   "mixed-content/worklet-animation-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
-   "7d54c015391f9459c30b4c7a9ec78a08d80c3a0b",
+   "159329a1ff0b48def00e858cb899edcf341b50d4",
    "testharness"
   ],
   "mixed-content/worklet-animation-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "e1a0ac5a997a0bd3f1384aa1d106204557f78488",
+   "0e045e1bce01971b6983cd41a133110d4c2fb3a4",
    "testharness"
   ],
   "mixed-content/worklet-animation-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "812cec20e183e442d905608174db0bdba5c3246e",
+   "6658abc73aea2ff423b930b177cb5465af13ead3",
    "testharness"
   ],
   "mixed-content/worklet-animation-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "a3611976131860574ef43436ce4b10c183611eda",
+   "32ac8f2c932e2ef0f108a69d4e3a63dcc1f7c721",
    "testharness"
   ],
   "mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "81e57b110c0beb38e1b0bc8e80258e151ccf1359",
+   "189a25b2e6d3d28bc53ae475967a7572a648b2a7",
    "testharness"
   ],
   "mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648509,7 +648515,7 @@
    "support"
   ],
   "mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "ec537f5792331dfb420c2572264668f01c457bc6",
+   "3144aba7d7abd05c6e3a2341a4adcce31bd78385",
    "testharness"
   ],
   "mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648517,7 +648523,7 @@
    "support"
   ],
   "mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "0b8ddb9cc9293ef86de47a67e0ec985b8ec2de94",
+   "6e5dcc59a868d05ab754128759f250f843217970",
    "testharness"
   ],
   "mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648525,7 +648531,7 @@
    "support"
   ],
   "mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "d2ab9e1e32510155a301074236d04b978197646b",
+   "d78de561bb09e0d859cf045b94beb0e65de631d3",
    "testharness"
   ],
   "mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648533,7 +648539,7 @@
    "support"
   ],
   "mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "e3b0cb8117978366000fd08530072073aecd591d",
+   "a1f5f72bec62c27f2de079e414b2e7dcba481dce",
    "testharness"
   ],
   "mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648541,7 +648547,7 @@
    "support"
   ],
   "mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "063c7b77c21cb6821116bab4fbdfce8e149c2ed1",
+   "85d1a1e954516a3d8b46c5a9842bcbea3ce83d89",
    "testharness"
   ],
   "mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648549,7 +648555,7 @@
    "support"
   ],
   "mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "802b84c1899da2ce51375a566fe437610457ca35",
+   "00b5d6f7eb21f39b4d87729f6513bf202f682782",
    "testharness"
   ],
   "mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
@@ -648557,7 +648563,7 @@
    "support"
   ],
   "mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "7e40482d496ef5f69edebbec5b040f04cba60abe",
+   "9cae068af5131066de201080ccdc39608f3115b0",
    "testharness"
   ],
   "mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
@@ -648565,51 +648571,51 @@
    "support"
   ],
   "mixed-content/worklet-audio-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "1c77b65b666a0a13577c521ddffbc9b99b3e4a67",
+   "c4846185f223efda127f1dd9bc8f253a90ffdc7f",
    "testharness"
   ],
   "mixed-content/worklet-audio-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "c5ec8343c9052ca28f905171bfd097be776aefe9",
+   "5f10d56162a980616f9faa89c2ccf5edb95fb923",
    "testharness"
   ],
   "mixed-content/worklet-audio-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "918aec37a419430a8cb42afe4bf1efdadf919ed1",
+   "502407cba75cf89603cf0632d1bf549fcbbcee74",
    "testharness"
   ],
   "mixed-content/worklet-audio-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "b801db0de2e4a137c6884951ba36d66c6f497a52",
+   "c0f2fc7a1765269e2f43935cb96ce2181cbbb967",
    "testharness"
   ],
   "mixed-content/worklet-audio-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
-   "65d7c00892ce6843cd6c572fd74c8c3d46614f92",
+   "7b6e331e2b178f2a986d6952ab5c38c69e8b4e8c",
    "testharness"
   ],
   "mixed-content/worklet-audio-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "bd3afe9856e09f1b95b287e9a594b40c4b2a9210",
+   "94cfb964c6db44e32d542fad9582d0007abbc769",
    "testharness"
   ],
   "mixed-content/worklet-audio-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "45759c1b31776383026ec6d2661610029c0a272f",
+   "49b910332a532d822f0ba6dfb9edeae8d18e44a0",
    "testharness"
   ],
   "mixed-content/worklet-audio-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
-   "5d2f67b7fff589312caa31550640dc5d57dfce76",
+   "6f8ea0151178d55cde1be8bbb30edae779a4876d",
    "testharness"
   ],
   "mixed-content/worklet-audio-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "fbf57e8b64799a0f13b0e64c9eba25597fe64995",
+   "1b18de0c696c532466fe615df01d71576bf524fb",
    "testharness"
   ],
   "mixed-content/worklet-audio-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "e297efb9433c63a4bcaad6db6c893d343e84477a",
+   "dfdbae7cb0c9573c347c4cf395a458e5f70ae6ec",
    "testharness"
   ],
   "mixed-content/worklet-audio-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "6e1e6cba39cc9a4378754d97b004ecc874287c8e",
+   "c6ce305c5fac3243e8a8d43f058f388e986d5a21",
    "testharness"
   ],
   "mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "68329ff582ed7d5bbb88b5affa6988d859efdb87",
+   "cba9bdc351cfd15a8bd0eef05ddd9c0a569b45d6",
    "testharness"
   ],
   "mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648617,7 +648623,7 @@
    "support"
   ],
   "mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "862abf012b55d586e91a4b3e74484e0791720db0",
+   "13eb20d20b4a9a1695ce0e1cc3b3225acbd2476e",
    "testharness"
   ],
   "mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648625,7 +648631,7 @@
    "support"
   ],
   "mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "9e8ca3cd5731b0cc4bd385e8662297f5d689117c",
+   "4df48a8f80f2abe08896701ffd9822db86abcc72",
    "testharness"
   ],
   "mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648633,7 +648639,7 @@
    "support"
   ],
   "mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "341e9584d94d79e46c43970229cf4cf853206074",
+   "9c796352a1d73ae10b66577f3b0e2e0a57f21ecb",
    "testharness"
   ],
   "mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648641,7 +648647,7 @@
    "support"
   ],
   "mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "0bf45c0d5114d6190e5bf8959e5400f0a6c3079d",
+   "176da0f4d48a5a8db59717df40da02bb26558c0a",
    "testharness"
   ],
   "mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648649,7 +648655,7 @@
    "support"
   ],
   "mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "017a388848358f7b52782e4b5fcc003baa251e0f",
+   "3ba97cc4af3349af5984687ba54a7caadbc7153d",
    "testharness"
   ],
   "mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648657,7 +648663,7 @@
    "support"
   ],
   "mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "c7f37dee35c366a95a8b01516618b68d33e6b4be",
+   "66857b1c235487f0b1cf0df30b3b30fdae422188",
    "testharness"
   ],
   "mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
@@ -648665,7 +648671,7 @@
    "support"
   ],
   "mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "84c5ae0d05ac74bfae97bfc6bc2bef541b8d1e61",
+   "e0b664bca0975f2b7f0d4bb655be397ef7fbad06",
    "testharness"
   ],
   "mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
@@ -648673,51 +648679,51 @@
    "support"
   ],
   "mixed-content/worklet-audio-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "b7f5cdc9c9c5637d5ff82a4b925ce224fdd2d8c5",
+   "6f688d70dd907a0228caaa3d30ebeca492203cd3",
    "testharness"
   ],
   "mixed-content/worklet-audio-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "adb418f61a912beb67f1a0aba73f0c39dabb0ac2",
+   "63bb81d1b8aedca3b8412fc6c34c60e8796dd91a",
    "testharness"
   ],
   "mixed-content/worklet-audio-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "ce31e04d1b1c4eea33af796b39d0369a615dd996",
+   "e9b11532395b322709abda14e9cd47f6bc03cf40",
    "testharness"
   ],
   "mixed-content/worklet-audio-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "8197d981d8beaa20049ba1e78c8004a18a8dfd17",
+   "6d72fbe85c2c0f5bbbe53d3a6a33e146a60cb9ab",
    "testharness"
   ],
   "mixed-content/worklet-audio-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
-   "60a5b9ec6e24b76a555a3c313af591fba5d987e4",
+   "ddb4146a26fe33e1554384d05eb31821ba341c3c",
    "testharness"
   ],
   "mixed-content/worklet-audio-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "035fe3bb0b132624bb9d64dd343b7bc190c11126",
+   "f2e6058f0f2ad1c5c01adb1197e95c7adf5168c7",
    "testharness"
   ],
   "mixed-content/worklet-audio-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "56c5e14673e17db4d0ecc02368a635f3ce3504e3",
+   "970723e66de3a941d477ff8e522f13c41da2ce03",
    "testharness"
   ],
   "mixed-content/worklet-audio-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
-   "f1e134adbed18a9ed295536a34ed501cdf13f31d",
+   "49011184e6c826afaaa4a44eb3b27dccd548d35d",
    "testharness"
   ],
   "mixed-content/worklet-audio-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "ce5d3e1c06576394619fb80f0b90971d2a146103",
+   "b0ea6b38a56ea35657a337ea3284ff8d7485151f",
    "testharness"
   ],
   "mixed-content/worklet-audio-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "5c123ed6cb1a8b30d5c3c6fb37cd19ba314c5ce6",
+   "4b1452782ea6a75372ffd654075b9c8c6a2e7d04",
    "testharness"
   ],
   "mixed-content/worklet-audio-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "06aadc3c3ce3edf8b0809a0cc8c7e31e8f453a25",
+   "4737340b7010ff3d4ab07e0f76458aec88dc715e",
    "testharness"
   ],
   "mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "bcc60543ae09b84877d4411c34e4a038ad558090",
+   "7e1db35ba0020fc660bd2396e95e0774dff5b829",
    "testharness"
   ],
   "mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648725,7 +648731,7 @@
    "support"
   ],
   "mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "e56443cb86bb6b98fca22eb3ff2a4630ebd86e05",
+   "617237da801b746d71b961ff6c7165216603916f",
    "testharness"
   ],
   "mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648733,7 +648739,7 @@
    "support"
   ],
   "mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "40569b7188d9dd0b069c255633fb98172faaddf2",
+   "3a90c1da480bdbb5b4bca01b5f06bd9776dba083",
    "testharness"
   ],
   "mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648741,7 +648747,7 @@
    "support"
   ],
   "mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "17226d674591f43976cc64e259ef66d9f15ef5c7",
+   "3f2b4aa46c11506b94f79e29911967e4044d7865",
    "testharness"
   ],
   "mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648749,7 +648755,7 @@
    "support"
   ],
   "mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "034c2f727de6dd945541c13f475e0f0d57fd0583",
+   "f6201721afc8c8b81df602a157c28040c31850c9",
    "testharness"
   ],
   "mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648757,7 +648763,7 @@
    "support"
   ],
   "mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "1ecd9d94e024decd21bca928de6acb4e9cc01eab",
+   "c96d2d4b267441369f9713bf8f87cb831661e22d",
    "testharness"
   ],
   "mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648765,7 +648771,7 @@
    "support"
   ],
   "mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "a60c79d490ff67b18047306dc6b2bc54b36289de",
+   "685bd1e4a13699e977357a7906821185270fbb55",
    "testharness"
   ],
   "mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
@@ -648773,7 +648779,7 @@
    "support"
   ],
   "mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "88efeaf094551471e55f72f5a9d63f301164e2f6",
+   "aaa62a95e808f3ff3dc817d1586639c6dce925f1",
    "testharness"
   ],
   "mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
@@ -648781,51 +648787,51 @@
    "support"
   ],
   "mixed-content/worklet-layout-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "2e33579ee35bf7c094be49835fd43b7132bc61a2",
+   "37d3c51754a5f024d3bf70bfce1bdb466a7bd119",
    "testharness"
   ],
   "mixed-content/worklet-layout-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "7f1353c5477fe8bef4ebcc721ae4f27a608d1269",
+   "8c1cecce2f9335e88beca9cba8f53630e1578219",
    "testharness"
   ],
   "mixed-content/worklet-layout-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "5cc77dd2e6bdbdf3fec827adb4f71da6d50c59b8",
+   "c766c5ed130a03f1c01647dd1bb99e105b7f8149",
    "testharness"
   ],
   "mixed-content/worklet-layout-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "6af86dd96b3a65df28a71731831f84814601c646",
+   "408d01cdf7c53c3460340257a9e5ff1f8efdd439",
    "testharness"
   ],
   "mixed-content/worklet-layout-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
-   "e6a9c4c426d22664e2530c49b16b2cfc475c74c1",
+   "bd5f1b0563e2029a1eecccb2354154946d2db2c2",
    "testharness"
   ],
   "mixed-content/worklet-layout-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "400622006fcfc2b5eb70d6c9974e1150524cf38c",
+   "006ee9d12bb9ee3151cfa634f9889b29cb88724c",
    "testharness"
   ],
   "mixed-content/worklet-layout-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "b4be536c9232548d97941af8cb4ec5195364755d",
+   "905856f6ceef4cfbcd09b67ada351c4e52d4b640",
    "testharness"
   ],
   "mixed-content/worklet-layout-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
-   "0d7b7210a99f472b738184b8a14becbc70c375f9",
+   "c031756b389ea1b9eada6b2f4fbe6985f6d8d584",
    "testharness"
   ],
   "mixed-content/worklet-layout-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "708c0a5d75f25389e08b8f2b4a104ecea580964e",
+   "c8c56c457f7af902a2cb5b9d87a0c6d3975cfc11",
    "testharness"
   ],
   "mixed-content/worklet-layout-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "2414d5f321c1868c340adfffc305762fc34408e9",
+   "a86f3b4429d3b6ac9838b443ed9561fbd051ab4a",
    "testharness"
   ],
   "mixed-content/worklet-layout-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "f0fa9aa60766f615fa90a02226c2cc0859dbfbfa",
+   "e0a437e26d6e70693371c75e1397642ff41a3ab0",
    "testharness"
   ],
   "mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "440630b5c2992992318574008eccfe02fa941e44",
+   "89b2402ec54478780912a3694d8e53f955f37bce",
    "testharness"
   ],
   "mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648833,7 +648839,7 @@
    "support"
   ],
   "mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "51cf26bcc86d8485fe3f9d4eb00766bcdbd391cf",
+   "5b01dbc1b7009b67683e7214ddeebcf995117f70",
    "testharness"
   ],
   "mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648841,7 +648847,7 @@
    "support"
   ],
   "mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "d38c0259e95bb7d214d8cd35126f855facede25a",
+   "55d23f9724e9926ed80d6f0acc642637b2bae8bf",
    "testharness"
   ],
   "mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648849,7 +648855,7 @@
    "support"
   ],
   "mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "f32666f28ac951258726c2bb836b771730d3a742",
+   "64d45885ecd5e8e07ecb7036523bc46036ce4ec1",
    "testharness"
   ],
   "mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648857,7 +648863,7 @@
    "support"
   ],
   "mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "016ea765f53e5597bc32c8746811a2f4281fe29f",
+   "27bb9376848de9611de04064ec63c3339dd75c39",
    "testharness"
   ],
   "mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648865,7 +648871,7 @@
    "support"
   ],
   "mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "47ba0d806743f000233b04e672de42ca4bbdad24",
+   "2bd8a109a029dce1717baba638f63aef5f2cc04d",
    "testharness"
   ],
   "mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648873,7 +648879,7 @@
    "support"
   ],
   "mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "6b339518948baf060cfd07cd0e971b327a7df2f6",
+   "8fec9a030fe9fbfe4e63dcff644a99b56cf5fd47",
    "testharness"
   ],
   "mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
@@ -648881,7 +648887,7 @@
    "support"
   ],
   "mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "349d1ae1e630c7f8cedb7533f1f5893e1bcc5a61",
+   "4bd827703940b87c6a30171630edb81e6d0bb78d",
    "testharness"
   ],
   "mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
@@ -648889,51 +648895,51 @@
    "support"
   ],
   "mixed-content/worklet-layout-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "ba7834dff565fc04140c987e16d9c3d7d2f9a9c9",
+   "cc5688915fe5b89adfa1cc381cef0d351de5ec2d",
    "testharness"
   ],
   "mixed-content/worklet-layout-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "d1514320a5c9c997a70b4ae2d0830fee14e97064",
+   "f50bb1848c2e1dfc4614904b792629528acf416a",
    "testharness"
   ],
   "mixed-content/worklet-layout-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "42b9de520ea1a8c3616da5d737cdd198546acfd0",
+   "785bc579c25f9867fe748152e499ae3ef72f0a90",
    "testharness"
   ],
   "mixed-content/worklet-layout-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "3a03aeae626722ad0595bfdea6f2b4f205db6c5a",
+   "2918d12dc193b74b697a466c58b3a3780b87d1ee",
    "testharness"
   ],
   "mixed-content/worklet-layout-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
-   "c087917e88dd39c37f4f2adfe9e10427c067ddf3",
+   "63ce10a6b6cb5b961e1b5d7569468342cbb4dd79",
    "testharness"
   ],
   "mixed-content/worklet-layout-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "f4192c219a49491089a0e489c19159f66011dede",
+   "333b26e8db573960bdeb7dfd3a7222194dcb3ace",
    "testharness"
   ],
   "mixed-content/worklet-layout-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "82713253b046a9a96d5720d3ee2b161938b690a3",
+   "29edc68057dd53c177e5de4a5fd7f16f49df9ef3",
    "testharness"
   ],
   "mixed-content/worklet-layout-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
-   "35ad440c528533853f33df9dca27c915601366c5",
+   "12ea7f2dbdf7f597e35527e65430f82a7a29eee3",
    "testharness"
   ],
   "mixed-content/worklet-layout-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "58227b988f35685e973a16a7d253417a6d30766b",
+   "ede2b9eb18f3802a3f22b00f59026e25d5117e0d",
    "testharness"
   ],
   "mixed-content/worklet-layout-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "e43a2542b1b386beb0571e3550940ddee95edb48",
+   "b35999d891a704c61c49a1b1181763add60012be",
    "testharness"
   ],
   "mixed-content/worklet-layout-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "4e0db8fc4486c3a061469776b06dd7df49ed7f6c",
+   "5ad4fdc5cffec60186da1f84aa3fa666d00c661b",
    "testharness"
   ],
   "mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "84345fb74a58d0172377f7f642d8df65983d2fa8",
+   "94dc4faaa08f876ec3541504ed5aa36e44f00f03",
    "testharness"
   ],
   "mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648941,7 +648947,7 @@
    "support"
   ],
   "mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "52595a63b0f0178873a02f1bd6496db6d40deedc",
+   "16377236490276abc35b59dbbc171650b262534d",
    "testharness"
   ],
   "mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648949,7 +648955,7 @@
    "support"
   ],
   "mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "0844824ea72a6e5e42d3560c0ea318f1692c39e2",
+   "c0df2746529db2ef99713d941e3286e48ae08b04",
    "testharness"
   ],
   "mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648957,7 +648963,7 @@
    "support"
   ],
   "mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "8b5df2cacc7175aaf424eb58a9045fa084e0417e",
+   "2e99652ac62d9709a59ba1834a44f50b38a6f2ca",
    "testharness"
   ],
   "mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648965,7 +648971,7 @@
    "support"
   ],
   "mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "b03a99c5e6a2be3d29f5502582b1e2f5aa5148fe",
+   "202b22c4be514baa35004a6e00dc8d47e59e7179",
    "testharness"
   ],
   "mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648973,7 +648979,7 @@
    "support"
   ],
   "mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "7180a72690d41cb07a2ef5ed68d18d02a0e10023",
+   "3e4c570310d6c9419e2d0f28cb8542248183f30d",
    "testharness"
   ],
   "mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -648981,7 +648987,7 @@
    "support"
   ],
   "mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "f228ae5dc8e835e66d40600ceb3a20a0ca1fdb59",
+   "df15dd97a6c3266f165b247eb803ec9e84286a85",
    "testharness"
   ],
   "mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
@@ -648989,7 +648995,7 @@
    "support"
   ],
   "mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "ca0a9f47db39d98227d5e2947755014061f2b756",
+   "23668777f15b77d6bf57e64dc41b743eefca9413",
    "testharness"
   ],
   "mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
@@ -648997,51 +649003,51 @@
    "support"
   ],
   "mixed-content/worklet-paint-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "7d38ae9f8d468e27cc6e5d5332b018414ea8bfca",
+   "a8b19ae720fec371c96ba376b79c5b3decd1a256",
    "testharness"
   ],
   "mixed-content/worklet-paint-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "c8bb0051668a8dc1a1ca3e24253348cd54522c2c",
+   "cfa30e472c2489daa23c1de079ff088f28aaa6fc",
    "testharness"
   ],
   "mixed-content/worklet-paint-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "e97507d57490bc390ec11e711fa4c01ae6ca8090",
+   "1c8391eb4cfa12e856c1e373246be83478d66182",
    "testharness"
   ],
   "mixed-content/worklet-paint-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "a9b350b5c9dffcb38aabb20d71cf388251184303",
+   "d33c7928abbf4a5b955cb81568aab47446d8a2ab",
    "testharness"
   ],
   "mixed-content/worklet-paint-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
-   "81db7898f321970f5c5ffc3d84fc968da6c00604",
+   "939f20f9dfd8615a329be81d78060599932d74ad",
    "testharness"
   ],
   "mixed-content/worklet-paint-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "999411c6297b12632f471e31bdd649a3efa0cc8c",
+   "be7e4ce7cce9f50ccb4ff067409265c64502c8f9",
    "testharness"
   ],
   "mixed-content/worklet-paint-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "de2d00317561424189967b2c2631cdea3accb513",
+   "f69486e70eb7462aad9b84f00fe88595f2dbd6c0",
    "testharness"
   ],
   "mixed-content/worklet-paint-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
-   "453c5cb95d01dc95a105f98e3d2bc7a7ba3eec62",
+   "806b2ae13bb870e7b267b1077304e3157383ba93",
    "testharness"
   ],
   "mixed-content/worklet-paint-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "fbf362903e17644fe760197abeeeaa43314bc46a",
+   "f0b30f8f3ee36353cc89390c4ea2c79745941599",
    "testharness"
   ],
   "mixed-content/worklet-paint-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "a34698e9f7ad0498c5337a5d6098e77e445cf6d0",
+   "9ff4c3ce1cf89a8b6bb43092b96042d58cc75510",
    "testharness"
   ],
   "mixed-content/worklet-paint-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "bbd268ab31c2debc8fb6324a1f7b51c9daeaf8d4",
+   "0edffdf2502bbe8cce9d6b9e711bacb2584cfc7b",
    "testharness"
   ],
   "mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "45472963891f1fc2690540fce6f4558477f48c68",
+   "ab3439a3bd888bd0c5c0b4bcc0d3d0d400831404",
    "testharness"
   ],
   "mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -649049,7 +649055,7 @@
    "support"
   ],
   "mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "6d519a352c425bdeb1a8013d71ba9f748240c61c",
+   "3d17e69cb37c29fcef48747135c397b8d68187c0",
    "testharness"
   ],
   "mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -649057,7 +649063,7 @@
    "support"
   ],
   "mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "2a317beae4e9f63546b3ce4a2dd7648b6846e19b",
+   "c060ab3384953cd17d9087931fa33c242838b3a9",
    "testharness"
   ],
   "mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -649065,7 +649071,7 @@
    "support"
   ],
   "mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "44d4b3d88524d6f016487ab5f927a3b7c0908e4a",
+   "22760d90a955d5c6bc247acf070d4daccc27d351",
    "testharness"
   ],
   "mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -649073,7 +649079,7 @@
    "support"
   ],
   "mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "f1af455623f28726236b979f5b27d71774e27a29",
+   "9f3bc48ef900e35646dbef110fef8acb54c226fe",
    "testharness"
   ],
   "mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -649081,7 +649087,7 @@
    "support"
   ],
   "mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "6eb6e95ef68aa994075a0e0a1bb669a4c1f845e7",
+   "95ef4692ed9dd8c94bbcc00edaa0bd37309561fa",
    "testharness"
   ],
   "mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -649089,7 +649095,7 @@
    "support"
   ],
   "mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "9b5656b9613831a4323fd22f1305a499e7bc6eec",
+   "145cb040149e20004c574bc6d9e193b5d16376d7",
    "testharness"
   ],
   "mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
@@ -649097,7 +649103,7 @@
    "support"
   ],
   "mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "4fbf140e66032e538f502bab8673416ddbd11b57",
+   "911051752d59a7cf137feb75c357316e72b3372b",
    "testharness"
   ],
   "mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
@@ -649105,51 +649111,51 @@
    "support"
   ],
   "mixed-content/worklet-paint-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "d1b9d5d6139a7525f8cd673082a28f9a0bb4db16",
+   "82434165647753da3fea77379b2a3873cc842443",
    "testharness"
   ],
   "mixed-content/worklet-paint-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "c328f8fe8a525f8a81fdfc0e02ef9b586a1a2526",
+   "e8d26e88be17340a9b3035d838eebc9cae8cacc6",
    "testharness"
   ],
   "mixed-content/worklet-paint-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "dc7cd63dceabb6ba3b6a9d76cb94be7a3dcd9737",
+   "9db55dc535487b9a2de666ef271437e45bdb526f",
    "testharness"
   ],
   "mixed-content/worklet-paint-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "1c7d29835bb84bae1a071a91e68eba12bc8fb582",
+   "4412335c444743a9b9ec22efa9755171dd905ede",
    "testharness"
   ],
   "mixed-content/worklet-paint-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
-   "cea0a88bacb62a3d14de770e5b19112edc152145",
+   "7f7d6b2b477601f47a89e8c64ca90df2016a2e83",
    "testharness"
   ],
   "mixed-content/worklet-paint-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "224d7c767b5cc47ec5b842efc376fdbd588660cc",
+   "9766454014906994e62ce7bb3bd4416db9fc1b68",
    "testharness"
   ],
   "mixed-content/worklet-paint-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "b1432e78ac28ce3b16c8b3bb0e0fcffa40204e96",
+   "196f60ff46e62fbc23a998288000df59eb420990",
    "testharness"
   ],
   "mixed-content/worklet-paint-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
-   "ce845cb3d521bbe85cd33f50e0a9d30efc9fc835",
+   "b2bf5c412b6e049da0ca26c96516c023e3bfbb03",
    "testharness"
   ],
   "mixed-content/worklet-paint-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "1e9acdf88e2930b242b2131ea3ad75e0155272b9",
+   "b931d339fdae1973f7d53b9709ba0c3fb31ce096",
    "testharness"
   ],
   "mixed-content/worklet-paint-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "0ff9576d6038a0735b0d9104aaaf269a3baef9ad",
+   "0eeba32e2134e97de2bdd07668d4fa77790636a4",
    "testharness"
   ],
   "mixed-content/worklet-paint-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "d0e64b29b2dda75cbc11d4480c3b5b59a408efae",
+   "1da3a8484ec5762850ac9c67ce831f9ace3fa924",
    "testharness"
   ],
   "mixed-content/xhr-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "314f097890579c1dee9bd9de7cfb58caa263cbcf",
+   "f70e0d7141507e4fe3db0c9bbcc34332bf03c89a",
    "testharness"
   ],
   "mixed-content/xhr-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -649157,7 +649163,7 @@
    "support"
   ],
   "mixed-content/xhr-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "d44e65bcd190a82cc4e90915f15412dd1298d00c",
+   "be74d7f085c2ce61eca89d1f292f13a19cb990d2",
    "testharness"
   ],
   "mixed-content/xhr-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -649165,7 +649171,7 @@
    "support"
   ],
   "mixed-content/xhr-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "973db8006fc6145483ca334142aa1d152d5b554d",
+   "39f508c2b1656a8e7a413ad7c13d5b55b8ccf1f7",
    "testharness"
   ],
   "mixed-content/xhr-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -649173,7 +649179,7 @@
    "support"
   ],
   "mixed-content/xhr-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "f8509416232c5c94e11ff13f495cd6dbaa139898",
+   "703e0af2959190ad224ec0d668606fde542f3c32",
    "testharness"
   ],
   "mixed-content/xhr-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -649181,7 +649187,7 @@
    "support"
   ],
   "mixed-content/xhr-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "0dd9e88e885f88d548f84714b310711236ea94e1",
+   "a1323d428a3857f56c1403554da4965123aa3cdb",
    "testharness"
   ],
   "mixed-content/xhr-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -649189,7 +649195,7 @@
    "support"
   ],
   "mixed-content/xhr-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html": [
-   "eb7f7ea2c7393290fe425db7633fd6eaca4b44e6",
+   "0aa1bf3f82f276bebd79aa862e0c9406fc620709",
    "testharness"
   ],
   "mixed-content/xhr-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers": [
@@ -649197,7 +649203,7 @@
    "support"
   ],
   "mixed-content/xhr-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "23f0a1fc89d3e36d278c785bea96d58328df3aa9",
+   "61fe95dbd29e0ef263a7d1d3fffe12156142fa0b",
    "testharness"
   ],
   "mixed-content/xhr-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers": [
@@ -649205,7 +649211,7 @@
    "support"
   ],
   "mixed-content/xhr-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "7baa3e54a98fc165157dda95fa9beffefcd8cd6a",
+   "8a0c5b1a51ff752134df853a5f2bc84a47adbb13",
    "testharness"
   ],
   "mixed-content/xhr-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers": [
@@ -649213,47 +649219,47 @@
    "support"
   ],
   "mixed-content/xhr-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "cf95677c7f6e2b13ac83da80144a4d0c407cd818",
+   "df3f8cc6f628896db6685b19ed491a696431acae",
    "testharness"
   ],
   "mixed-content/xhr-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html": [
-   "80a633ab22fe886c4a01a4b8e8b1135c68d418aa",
+   "74261daf151ab48e374639a871e40c433d6472c0",
    "testharness"
   ],
   "mixed-content/xhr-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "ebbc9ec0c6751715146686f12f38e0d6cf190efc",
+   "45cd5ea84230f32c16748abc129adb83d283e5d0",
    "testharness"
   ],
   "mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "b2ee591a74aa3d94a876bd233791086593de933c",
+   "ed8f550d8952802112e267224964ec48a7c3dbb1",
    "testharness"
   ],
   "mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
-   "e49db79f3d38c40862f3f79cc89407639c3592b4",
+   "c14bc41c79e62e3836202eb40e0495ac0c9e0cc9",
    "testharness"
   ],
   "mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "ffd8aeb9c0b9a2f3202b832d785098cf147f7aea",
+   "1061f61fe383c4a07fb74a0c1e79ee882a10a6a3",
    "testharness"
   ],
   "mixed-content/xhr-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "897354a798ace13936db781c7eb78bd5f7d7f37d",
+   "18a5a3e8b4d19008aecea4b4550b2279bc1d2921",
    "testharness"
   ],
   "mixed-content/xhr-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html": [
-   "ee787d05aa3c30c02fae7145bf6c38c23f7aeb2e",
+   "d47797aca2316c12f22dbb62d878e4693a862960",
    "testharness"
   ],
   "mixed-content/xhr-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html": [
-   "9a9085b86ebf5db73243a637077a49f161f6745c",
+   "ff17fa2abbb545249e81f3788e6cc102c10194c8",
    "testharness"
   ],
   "mixed-content/xhr-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html": [
-   "9da0d9f98ecb9dbd9a5857d6ac03622ea77c014e",
+   "76d5442339d42d11a1f6f38f06194f268f149920",
    "testharness"
   ],
   "mixed-content/xhr-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html": [
-   "b0fff36eb94609ac24a76121bf9e201234885db1",
+   "e6eba571c0e79242412a23f073068c1db3d0425f",
    "testharness"
   ],
   "mst-content-hint/META.yml": [
@@ -658241,7 +658247,7 @@
    "support"
   ],
   "referrer-policy/README.md": [
-   "a4cc29b3851d3c2f985a01861d56b7f45380dae1",
+   "c4694dc3728ba40c97612565886215b05d63965e",
    "support"
   ],
   "referrer-policy/css-integration/README.md": [
@@ -658249,15 +658255,15 @@
    "support"
   ],
   "referrer-policy/css-integration/child-css/external-import-stylesheet.html": [
-   "6be475e98bc2736a0f1409261d48f8f02a6c9461",
+   "9245ff39c6eafe272e70d3f208eb6f18876f2c62",
    "testharness"
   ],
   "referrer-policy/css-integration/child-css/internal-import-stylesheet.html": [
-   "37370fdd3710c8459e3f6b19980f4308559ad7f4",
+   "c25b99926a0a12bf2f1a2d60bf1a9cc9c58fae22",
    "testharness"
   ],
   "referrer-policy/css-integration/child-css/processing-instruction.html": [
-   "5362234177418da5eba46bbcbc5e5f62d3366de9",
+   "36d8bbc0216df9536aa8e9ffeb5b7ff673c31174",
    "testharness"
   ],
   "referrer-policy/css-integration/css-test-helper.js": [
@@ -658265,87 +658271,83 @@
    "support"
   ],
   "referrer-policy/css-integration/font-face/external-import-stylesheet.html": [
-   "300960d2944d11fa327077ac57df5336b0337296",
+   "6bd0554ccdfdd9054ea984a1d95799de838954d3",
    "testharness"
   ],
   "referrer-policy/css-integration/font-face/external-stylesheet.html": [
-   "45da018cb02e82ac17ec74d5e63747ad2aa972fa",
+   "8773664625c4472f7ce75c5aba76be83573bd5dd",
    "testharness"
   ],
   "referrer-policy/css-integration/font-face/internal-import-stylesheet.html": [
-   "dd06b7d7bb1f7a0fccf532e395f32cc2026235de",
+   "6dcf6be3e7d705aa6694342abc9cc86eab97c966",
    "testharness"
   ],
   "referrer-policy/css-integration/font-face/internal-stylesheet.html": [
-   "a0a9067b3b846edcc4acc548c74e6b643116cab3",
+   "0d54bb766f771fedaca6676ccee539ed7429133c",
    "testharness"
   ],
   "referrer-policy/css-integration/font-face/processing-instruction.html": [
-   "a9d79a33b08e6b10a17495663fb4c7d9337370ef",
+   "26203a822681b81b0a5192461d1d99decb54ddc6",
    "testharness"
   ],
   "referrer-policy/css-integration/image/external-import-stylesheet.html": [
-   "2a7ac43a75466ec6e1c47d57ad14c01453728c3d",
+   "7c5a8c3d70941adaf679a83c8073b36f3b09a5e9",
    "testharness"
   ],
   "referrer-policy/css-integration/image/external-stylesheet.html": [
-   "c763ecbcff781a7e047b1425f7bf993e363721a0",
+   "72a807bec6ba56b92ea62c8fbc1c20a9d8fd980e",
    "testharness"
   ],
   "referrer-policy/css-integration/image/inline-style.html": [
-   "da571afbbc830b7ccdb7b24ced20bf7aa20c9529",
+   "7e3d8879a4ae243fd75ae33c6a308f20983636f4",
    "testharness"
   ],
   "referrer-policy/css-integration/image/internal-import-stylesheet.html": [
-   "e320e063f2df492e99944328dc3f009cfd9bcbb8",
+   "e94218d419e6dae751c757f915cc5d4d1133fcbc",
    "testharness"
   ],
   "referrer-policy/css-integration/image/internal-stylesheet.html": [
-   "3e2fc109936203732e0b25fbc96e3ac519df559b",
+   "a6107cb3a995d7808312f0029afce11d209ece69",
    "testharness"
   ],
   "referrer-policy/css-integration/image/presentation-attribute.html": [
-   "e810df54b8291120b13fb68cbecd9d1a71b1f8ce",
+   "ee70f15885c7145d7d235a9efd146856f4fca47b",
    "testharness"
   ],
   "referrer-policy/css-integration/image/processing-instruction.html": [
-   "e5a1e20af72468994fc6120f1d29e894804c13a8",
+   "c2b31be889938de3402611f02fffc6b6404429c7",
    "testharness"
   ],
   "referrer-policy/css-integration/svg/external-stylesheet.html": [
-   "dfa6fd073b9b1e2268e1cc66754d7d0e442bdc02",
+   "54ee36ce30bdf767f4d42855621d9c603fff7b43",
    "testharness"
   ],
   "referrer-policy/css-integration/svg/inline-style.html": [
-   "fd6e4baeae57d1546de2b47766dfa507b23361e1",
+   "59fb4025f3ba1ad96eb734805a162c4a39f08faf",
    "testharness"
   ],
   "referrer-policy/css-integration/svg/internal-stylesheet.html": [
-   "228de6d700b96cfc7ae85ff9c7ebb60f20197afd",
+   "82d75665ea1cc14efb3d9df64f8c115b5f6a1792",
    "testharness"
   ],
   "referrer-policy/css-integration/svg/presentation-attribute.html": [
-   "65bb642f5bf3e3a6fdf27a39c55b536365375a23",
+   "8e616416380e3527535c0bf12e6aca630efdefbf",
    "testharness"
   ],
   "referrer-policy/css-integration/svg/processing-instruction.html": [
-   "c0e8d4bf8169bf210674d7d9acf7bda994b01bf4",
+   "99ec1ae6aeb8737e996bc355f6e42cc5705b1a0f",
    "testharness"
   ],
-  "referrer-policy/generic/common.js": [
-   "f1574e99360f456640d0c1a2882a54eb98fce17b",
-   "support"
-  ],
   "referrer-policy/generic/iframe-inheritance.html": [
-   "6c54c43a81542a8349eebcbd0d35c28fb15d3e23",
+   "3bab0979dd91afb0c6bc09baca8ce1eafe07ba5f",
    "testharness"
   ],
   "referrer-policy/generic/link-rel-prefetch.html": [
-   "16452b1d690bd19ac118f34efac385264450569d",
+   "0f78596fa2d78e066d8152cbee56815d4bc7b5d3",
    "testharness"
   ],
   "referrer-policy/generic/multiple-headers-and-values.html": [
-   "ccbc02bec1bc5bced33bf88b97e4afc49f7949c2",
+   "d6b9408c1536b7526f101ea27473b9461534aaf4",
    "testharness"
   ],
   "referrer-policy/generic/multiple-headers-and-values.html.headers": [
@@ -658353,7 +658355,7 @@
    "support"
   ],
   "referrer-policy/generic/multiple-headers-combined.html": [
-   "7def76b9dd1e8754f6c8a243683eaeb4c25989ee",
+   "0b36aeee94c33de08f38491bde31519acc504527",
    "testharness"
   ],
   "referrer-policy/generic/multiple-headers-combined.html.headers": [
@@ -658361,7 +658363,7 @@
    "support"
   ],
   "referrer-policy/generic/multiple-headers-one-invalid.html": [
-   "eb6c21731b39ebd310526cc3345be0ac868dd919",
+   "599ffdccc3ead1b56b75e30f5f41a857ecb50eaa",
    "testharness"
   ],
   "referrer-policy/generic/multiple-headers-one-invalid.html.headers": [
@@ -658369,7 +658371,7 @@
    "support"
   ],
   "referrer-policy/generic/multiple-headers-one-unknown-token.html": [
-   "91e216b22a1392867d27db0b02aa318aef65d613",
+   "cf9a792162621e905873c5deff774f6aeedc880c",
    "testharness"
   ],
   "referrer-policy/generic/multiple-headers-one-unknown-token.html.headers": [
@@ -658377,7 +658379,7 @@
    "support"
   ],
   "referrer-policy/generic/multiple-headers.html": [
-   "a74cf60d89a5e4ee4a036613745acea5a83cae25",
+   "418044a14cdc4fc5d8cbfd54648a7c24981b9cbe",
    "testharness"
   ],
   "referrer-policy/generic/multiple-headers.html.headers": [
@@ -658389,7 +658391,7 @@
    "support"
   ],
   "referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html": [
-   "73b48f1d5c042cd121a2d3715ac4be70007bbb87",
+   "103627b21df00b578ac61bb3acc021254820ba66",
    "testharness"
   ],
   "referrer-policy/generic/sanity-checker.js": [
@@ -658397,7 +658399,7 @@
    "support"
   ],
   "referrer-policy/generic/subresource-test/area-navigate.html": [
-   "c601c249d0ff1c226dd495a23bb348010e1c16f2",
+   "b7f05be9892b1766820d10154a733c80126ee8e7",
    "testharness"
   ],
   "referrer-policy/generic/subresource-test/attr-referrer-invalid-value.html": [
@@ -658405,31 +658407,31 @@
    "testharness"
   ],
   "referrer-policy/generic/subresource-test/fetch-messaging.html": [
-   "4d40245123ff6071aa3db4e96c379ec553866154",
+   "2c12ae45510c7b1d226dd7d9878fc3dca9e3dadd",
    "testharness"
   ],
   "referrer-policy/generic/subresource-test/iframe-messaging.html": [
-   "3072436bc64a11299233132297147a028c9a8065",
+   "3bfada318f2a2b76bfdfb79f53950881474c437a",
    "testharness"
   ],
   "referrer-policy/generic/subresource-test/image-decoding.html": [
-   "b132c06c3f15dbe497e58c1be31aa75c112b2cfb",
+   "807344dab9f14221f37bb7d731a8022fe9db9869",
    "testharness"
   ],
   "referrer-policy/generic/subresource-test/link-navigate.html": [
-   "583458b535945f77f89879bd56ad0527ffa6df81",
+   "8c5d2c8386608dd5b8eafbda88f15e0045b3f837",
    "testharness"
   ],
   "referrer-policy/generic/subresource-test/script-messaging.html": [
-   "7bc36dc7abf068116ee457a292cc29c72d7926ef",
+   "cdeb1a03ed3c3145c6c927cd851435aeac176640",
    "testharness"
   ],
   "referrer-policy/generic/subresource-test/worker-messaging.html": [
-   "9daf6d5f9027a51f5bcac2d2364d6cd8722dcbad",
+   "7ef9b381ae4f151ae409495b28bf7cee8db99a0e",
    "testharness"
   ],
   "referrer-policy/generic/subresource-test/xhr-messaging.html": [
-   "a0208051206a4cf4b48ba0574c63fea589df1202",
+   "1bd1b4c724ea6da41cf3d42b30189649628d211e",
    "testharness"
   ],
   "referrer-policy/generic/subresource/__init__.py": [
@@ -658513,7 +658515,7 @@
    "support"
   ],
   "referrer-policy/generic/template/test.debug.html.template": [
-   "0faf63bddb3ad9ef5a5a90e6a5f8561bc117e141",
+   "ce7761b949df343162767f64612ec713805fbf10",
    "support"
   ],
   "referrer-policy/generic/template/test.js.template": [
@@ -658521,7 +658523,7 @@
    "support"
   ],
   "referrer-policy/generic/template/test.release.html.template": [
-   "0d63fd68aef8e9954949ff9844539a09c71bd9ce",
+   "e55a50bdc418a1cc817a4df0b2d3f6af6ea1fd13",
    "support"
   ],
   "referrer-policy/generic/template/test_description.template": [
@@ -658557,171 +658559,171 @@
    "support"
   ],
   "referrer-policy/generic/unsupported-csp-referrer-directive.html": [
-   "40942a8a0358149f1408010b224a4317a1f940ce",
+   "f639ead4d4387c412734e3375569413f99cacf81",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "101f20892106a6af015d94d43e8d21393bf39930",
+   "cbe5c3409c190a60a35bec69136a0fa7ad32e188",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "e5e6a7861d6002d8245703693270b53ae1ecdd82",
+   "bdbf8c101283f756841492823c88ff21cc2b9ebb",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "9d0ab2400728f2e31fbd96991cd268d48a5fa0b1",
+   "7bdbbc130dbfd593434d804ce711c272dbc41992",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "a8935c2be47f7a49ebea983b68bfb4287b429c53",
+   "7badfd8b68fcdc3db91eae7cf0cbb09e0164aa72",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "35d6245f51afa9d434c009f9e25803feca55b229",
+   "456672827fb7fbc3a1789e4754ff24a9aa72aa7f",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "dae1ad56c19a62dffa1d43c5771590e342249e5e",
+   "f3a056045a9c1ce4fd3660c67ede9a825a10c29c",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "86fa9997caca90db4b705410c6e14fb12019c6a5",
+   "3498954b56264ac32055792c02e70ac68ee27aa1",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "f8712fd2a42cbef95771c217eadb63813001342b",
+   "d474e014b14ede70ab26b2375ecf2cdd53733370",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "701ec1dba42c9585f5ccaa5c019681fabf162b57",
+   "d4835b418fd5c9520c89df35db0a7d73baff9a5f",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "d1b0482e16f9dc4676d2a2dc059411a19212114f",
+   "df7e879bed26b972e86b5b70dc1a3c13e8e40ebe",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "9dcfbac38af31b054fb55bdc783ac7afde820346",
+   "4fa4a9e8389305e2d8f17b375a8552e97f72a67f",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "9f8f2d884db7ec32fcd0f7c598697206efa930be",
+   "72be051717d694cbf72cb98381f4719e845f12f2",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "ca6ada18114f3bb2ec371d05b4a128bc1700ac9a",
+   "1ad65c0bf41df971fc86add02247fb7819d8ee10",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "49a8973c42ec06c77837f417d468b804a6fb0f75",
+   "81f4844a678978dac933de3079f80ee755a84657",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "a1eaf56efbfb72064c29ce2aaa1b62d9ea91c200",
+   "1c7bce4c0dd62169b6d9167f42c6b04450d9afeb",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "70e193434bb367c53a769a5ca56e342c8c1ea5a8",
+   "370d63871938d535f48bf9c8da695bb3e2394f62",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "85d4a15f7af5be95f1a029b2dd01c24b2dfcbf16",
+   "81553daeb1952a99f0794f8bbed0d0934807f464",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "e6863a13df8b568198918f04942af37f10a761a6",
+   "9c5d60894ea86ea31a3a4dc169703c444db7d072",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "9a2dd530ff9403e9d11a24ad76d0d593bcc6e6fe",
+   "301c53de00098644a3522fc78c3b4a4080b0a36f",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "058e087238ad080fd40007edd39509cfcba21279",
+   "a17c9867c1c3ddd775ce690ed160198f52bf3377",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "20d2c1be3d7ac21cd25a579bec62da38970b7272",
+   "7035e54e0039674f53063156eabca93e0d26ed52",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "c5c0dd241579c0fb7644f28eba2403f79273681b",
+   "4208fb4944fbd9ee317640148771c24df825b759",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "d5e3b9fe04db7635debb625c75250b88763d14d7",
+   "79180dd34081593d13752dd2be55ee1700af0b28",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "b3e883240b74350af724bf0c3e23a469f7eae1d1",
+   "cfcaf54f0258e35b81ffabbb71f1f2a7aeaa2c8d",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "1415f88e61b7e91ab40c9850314dd9332524b830",
+   "a31e8ef5d949bbd5cc72703f1d6765acc2d79aee",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "c9e14a5c67af7fb7aa2b0737977f8541073e9099",
+   "59edb33d0c6acbe01511fdd1c1b1a2636bde5c7f",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "1197e4ea08a2f20826e8cf6114945f079f8515f3",
+   "c9959ff21aa79856fc2dc0e6d6f4baa8f397dc3f",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "c2c4ccdb7147b4a9d5cf09c965e5e24f6ca51523",
+   "2d0c22356dd8604508fc616bcaf36157758b1c1f",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "e5da88157d58dc326197fedd2b9252f462cc6642",
+   "91c0a42f51a2f104cfe1bc454e46d16185a55f3c",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "a0e3be12513e469a3025805e6a12b7f8f6207fab",
+   "dc29dbf6b805abc400dbb5d725adbb70862ef917",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "ca23aa444bd77e3a44a001c541183e195e9a90b4",
+   "11bfaaa5011e38a7134d2ade2337c885382120bb",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "34a7176c909847a5e10962f2c49ec0a6b50efc27",
+   "cde4ea0089d71adb0d0c8a6d0a6208ba0465d1dc",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "621a3f4f5de65035a5718cf187b07c5fb3fce6fd",
+   "a28f30625e83ce411a5858101d51b9d7de7ba68a",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "7081357984aa1cb124887ce39dfe8811acfd057a",
+   "65bd20884db96c32f14dfa64948183b859f5329e",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "ca8b0837bbb5499c91825add5fccc49e2c478ab5",
+   "1e92417cd9cd09bfd5608024a323936d90bcc7a8",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "553af1be531592d8c7f7f4ea3115ad9e00831fd7",
+   "1ea239cd8395ce4acfeb8cc03c8522026707f56a",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "5ac87bc663a0454d4aa413006a6c17be10f49848",
+   "f0826241b16967d1959e18df81fca2f72be95b27",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "389921d4d8f360fccf2fdac5f830132d28473b32",
+   "feec9a66a67066bd686170454e1a0e01fe05ee2f",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "dfbabf21082184dc015e247195e9443521044850",
+   "dac22586386c7eeee7466fb75a6986c019d6ac94",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "233611e6952311387599b944e38f60c2c8d26e4f",
+   "1710dd861f8820d363ee3225f832037e4ce41c38",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "133936739413daa9ce407095177d8b44cd90b84d",
+   "43faed2e589636a3d980e3718a34b3d557b7393f",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.headers": [
@@ -658729,7 +658731,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "301edeccd840595d2466a7c4413ae97115b3d72d",
+   "53d3ed97e59ec8207f65b371cc9386288d264170",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -658737,7 +658739,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
-   "e398d4662d6222f3e5fe315f9a9ff80a562b20e7",
+   "9386254ef461d713021498195cd9a4dde89deadc",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.headers": [
@@ -658745,7 +658747,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "eb995697d5cba3f902d36529b1e7e5d9fcf79bcd",
+   "97f3d84dfccbc98d80a64d54186117e5642f333f",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html.headers": [
@@ -658753,7 +658755,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "a05ee8ec350e65556578e689a2b04c225fc1055c",
+   "9f12fd80e53b242cdba1994320cc7421bf6de523",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -658761,7 +658763,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "00e0b12f96b4dc3c67785707db704e1e3faa5459",
+   "7389528742f86656ee4020d79ff4814a94ad7d1a",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html.headers": [
@@ -658769,7 +658771,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "4e1745300b2ddd5a425fc48b3e81f6ec96e4a0bb",
+   "3e87aa52cd9f65f2817318cefe0a331ed45a3ff0",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
@@ -658777,7 +658779,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "99be5759bc8eaa2cdec152a07b747161d0b00214",
+   "8d779a2ac85938507a411310a018258ebb194bb1",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -658785,7 +658787,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "8b4c4a85cff3c22e46314da1cf254d5f11ad4f42",
+   "f8f58a8ed4dd899f710fceb3a03ab51982e2e9bb",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.headers": [
@@ -658793,7 +658795,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "3a808fa1663c046c3326d2bf24b71873c5d0e876",
+   "61e507067e89a2f2ef27d1d415aad973d5a82bf9",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
@@ -658801,7 +658803,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "e6a4a48ef5001b3192807b1f327b411e8fca86e6",
+   "ed912fdbcc655dcfd6c180abe9c55ccdd536753d",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -658809,7 +658811,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "5b6a0f069f0389bdfe1bfc77c967e5d0eed3c9f1",
+   "bb4ccc4abf275bfbd3a56dd3fa4e8a4938b1cf34",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html.headers": [
@@ -658817,7 +658819,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "45a76a77635d048d7255ee640ad6b87874da7751",
+   "ddc4a43ffd780f2b276ebac5008ee8afb1af4702",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
@@ -658825,7 +658827,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "a3f6a8b6092188e92bc2c5ef219177ffeb48e9fa",
+   "0adea708a1db934d57a672c810e905386b541227",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -658833,7 +658835,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
-   "013ad95a13af247527b49ef3fbc855fedc01ed75",
+   "2756f3764504f7b022ab24fb4b8e8f9b7b548e7b",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html.headers": [
@@ -658841,7 +658843,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "eb834de9b0ed120d2a29991946f95a9a1c10f4ac",
+   "a92a57a999bc9ae8a7ddc0566ed67068cd0f3e6b",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html.headers": [
@@ -658849,7 +658851,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "babd2f18cc56c3b556b3ebc19bb4121e7954098d",
+   "5effff6c0e032730da91ef80147373ec330a82fe",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -658857,7 +658859,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "a3f6d25c82f6fb66905ba9746954f4f403338e15",
+   "a386a250de015f043d6247ab492a5edd152b174c",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -658865,7 +658867,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "7e456c4025a41162be104da028331a208af31cf7",
+   "041a0deff1dc1abcfcc804181d07b97ae42e7921",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.headers": [
@@ -658873,7 +658875,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "6684bb31ed0923bbd3be331d17bae5bc43c74ecb",
+   "3eed81bb188ca21e7dd91b7e18ddd0d5ffb80b23",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -658881,7 +658883,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "2937568168156103f0287d42b259ae9766e08e00",
+   "91e8184af98d0a14f00d7908374714a05cf3301f",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -658889,7 +658891,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "695a773b087771ad9cb4885ab12be19f84eaf2eb",
+   "4dca8709603e8a6e9c7b7627f732618ba45ec655",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -658897,7 +658899,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "f7e7f0bf280d4dae34a670f5a9ed06532ed1b930",
+   "451de2c941b2a5e7d9d55f9a3cca5e205abe1b62",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -658905,7 +658907,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "a54cf8649954b4d4318c9909d53c685e9b2edc95",
+   "7f40332eebdcdef3ecb3b15282bbbf04daca9c42",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -658913,7 +658915,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "b7adfc59b0e43b462290adfc6661058293de4665",
+   "427d70cb5c6d5b670a39ed3308af1890dfe4ab14",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -658921,7 +658923,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "6639c028e2e33cab86611f480cf5f99c4bdfeda5",
+   "d6783b5588923e27d2cf87cd4037f3c80fc7af33",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -658929,7 +658931,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "f6e4ba09b587844a443e1661d38923bc5dcf8aa5",
+   "3299615960543d5c798cf9f64dd4febbc781136f",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -658937,7 +658939,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "8aaee1ba91b0d1c0ee9e20c2215bcb9b3f62a2b6",
+   "46da8711749dd52ec4d55cffedac36643024af04",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -658945,7 +658947,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "0a7d63121c2db30676dbe46d0a81e50b363b6c4c",
+   "b7cd58894796da066fdbce0dbf8fa400e13f401b",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -658953,7 +658955,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "5c4afd6b405c04c6e8b2e532f9751d2ff9d77f12",
+   "63841b8db447063096819ba8fcee072ee52a74d5",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -658961,7 +658963,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "bd9dec511f49701c143ba1ab277dba704736224d",
+   "6b9d4d1c99128c61f539925ccbcc29a72ed0b986",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers": [
@@ -658969,7 +658971,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "dd03fe581760b3749bd056a11a00da9937b1b6e9",
+   "d030178341fff62882187169dff343f613e9ca47",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -658977,7 +658979,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "ca38b699f4d9a464d57e1fd0b07772e7f766249e",
+   "2aa0c8e1e43529d8267ff92d5da19209492ec607",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.headers": [
@@ -658985,7 +658987,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "5b0157e85f2bdbb3a163764e2b84b6ef7ff3e9be",
+   "720329eab8ebc67623a884d9c14974d1b5c49991",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -658993,7 +658995,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
-   "47a08ddf8458eb62ee1acd3dfa39ebc2887de911",
+   "116f07c80db7da716044ff92d8592fd750c63af9",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.headers": [
@@ -659001,7 +659003,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "be990f2112a2ac4de8aa22813b9272bd5b5ae80b",
+   "4bc58094681cf8d4a583d7a3c828c197de69d265",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html.headers": [
@@ -659009,7 +659011,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "8cf74125ad869995ade9fc063b6459b54bc75b15",
+   "df2d8fc463e77633460782852cf3c756995291d8",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -659017,7 +659019,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "7cb08817b904d1c593a5077f439ea31151549d82",
+   "dafaeb26443004caddfae5b4d1575249c780af02",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html.headers": [
@@ -659025,7 +659027,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "2a4bde0b9b62e79fb4ba0edf23240c2ce718040d",
+   "b2aa15f1be1dec1b8e1cf4b4b764c63de8f3fb29",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
@@ -659033,7 +659035,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "55ccac1f143b1346822406eab675a294536f00f0",
+   "8082bae869f3a5d933cabae76b30ecb2518ac87e",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -659041,7 +659043,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "36e1fed42e44966e272ed89fc1cb52c677f10434",
+   "dd54f1d1b9065f32e22fa2ca713d945aac289c20",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.headers": [
@@ -659049,7 +659051,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "fc4a9865cad7ce01d4ba4319dd4c296c54103b7e",
+   "e6ab88cc7dcfa2229854b44adb4dd531dc37c58a",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
@@ -659057,7 +659059,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html": [
-   "6cc76f7583b2f1bcdff27ee6e2fdba8634d26afb",
+   "3032473568819cd0fa261830eef8797cc3755de2",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -659065,7 +659067,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html": [
-   "7eb7b813825853a2207d5016fcd1fd017c71c903",
+   "e8c152f1e5451bfb574cbbefd7fd0c94c48bc78f",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html.headers": [
@@ -659073,7 +659075,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "c0fe57edd2661e8ae300b6b07f81abe43a0103d7",
+   "35f607209b41956616a4b78c1d04599f99449461",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -659081,7 +659083,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "dffd45534d182f878397ac29b24d90606e860d11",
+   "fc629c39dabfdb6578c339bdd34993abe84c8fb6",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html.headers": [
@@ -659089,7 +659091,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "79d8995f9c326cf69896a91e4fe3c8d07595b1f7",
+   "7148d4973c430673d46c612ce5b201cc04fe37c8",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
@@ -659097,7 +659099,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html": [
-   "ab381f0c907d7ca2fa231780ff099c41286c36cc",
+   "0fefd8d9e7647897eb94d0cd165cbf1f5b6a4c6d",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -659105,7 +659107,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html": [
-   "d0b3f5affb19c6eb7978472c8ca8228011746f84",
+   "1929fde3fa89503ab18338d6432698fcd2eff59d",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html.headers": [
@@ -659113,7 +659115,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "b900876cb4ab163e8aa9c957f22d47bc8d2ef08a",
+   "acf66a905b2cb899867ed58e077fe0b4665cd05d",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -659121,7 +659123,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html": [
-   "834afccf6769089c8abfb4d112d0560b001a28d2",
+   "75e2cd73efaa5ab1645e46bcb634578ceb6ec75c",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html.headers": [
@@ -659129,7 +659131,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "d521c167171457b18adf7426a5f607c13cd3bb36",
+   "f9fb398c8788ae93a69ea4468567a8834f5ef1c1",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -659137,7 +659139,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
-   "6299e8ec7f65292273438256f555b000e2b0d183",
+   "559872f1f31bc0413e127fe45768dbd640d7a0c1",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html.headers": [
@@ -659145,7 +659147,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "c67433bb7242b01b35398e656898c12aac4e988a",
+   "ac2bec35ae2032cb6becc988242b865b03f9617d",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html.headers": [
@@ -659153,7 +659155,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "eec9e271431e0f19e95ab4ae709d3f5549d828f7",
+   "34d782c22c7d46612a4661ca1fba7ca25b0a9ddc",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -659161,7 +659163,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "8b46cf58362a7ebbb17ef1bdbe3b188afa9af661",
+   "f6f19227db00259508cd334dbefc02f0f1de3470",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -659169,7 +659171,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "94290a0c45600d3cb8dc1b3e8ba763d326f383d4",
+   "149727967ddc1963e23b8d841e0864d04a4e5d28",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.headers": [
@@ -659177,7 +659179,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "dd800d38e482e10a241a9c053360acbf058e94cc",
+   "eef23b2791d8460acff6eece7cf9dd529b2d4115",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -659185,7 +659187,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "96b2d3201b48cf53c662afe5301d0333ff41065d",
+   "45f515c04cb29648460b3b9a1657b43d801292b1",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -659193,7 +659195,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "75f0f333483645d1bb1ef0dd2c173e2e2aa5a0fa",
+   "6970b1f74cf7f14e2ed45f4562432b82391f484a",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -659201,7 +659203,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "97c4bb92e94976f94ee8c4362c270fd1b441a9a8",
+   "b529c14ef8a5fa0b4e9213150fa6a42f4d857d0c",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -659209,7 +659211,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "f6e9650e24161a143075cf8c382d85589568b697",
+   "54d02b588ca6d988d67066653aaea5c0a2249a26",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -659217,7 +659219,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "71ff29503cb034fa7b9050c2766c67570daf888a",
+   "43c1f774cc4d30364182de950ad83dcd1d2d855f",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -659225,7 +659227,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "399bb0c14acc5f4e4079b013318c97782d7f80f8",
+   "8afc89e111996ac2ecd561be90b129922be55b0c",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -659233,7 +659235,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "2ec45b40a56a8f86dbf4bbfc3d527bb04f5db1c3",
+   "c8046a61bd93dd4ea0b98bc23dccc99baa7fa388",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -659241,7 +659243,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "6a93f8429db02b7707aec72269c617ecbd811ccb",
+   "f5a167388698388f59108abb97ec3245e7ea3f01",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -659249,7 +659251,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "9b72d4bbb75b521bb1fd1513599915f99a1bb10c",
+   "f4bec4504c02d79500354d147809d93ce340488a",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -659257,7 +659259,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "a7fac617780c7ab44d5e08ee7e2b84fa83d5bba0",
+   "68f694ea714aa79d8cfe4050047fdeba23ffab40",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -659265,7 +659267,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "6e8a612c8c483d2730556673ac5a58a7cc56037f",
+   "4bd40993f26fe0f7f1d23aa2e90957a52cce0b38",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers": [
@@ -659273,7 +659275,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "68cc56301584ac4d6933ec78fb88a4b04d7697e6",
+   "7dbb5581889ffc439f23a81004f49a2758e2015c",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -659281,447 +659283,447 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "af2ce4df2e84aa18c55233b80041dc7810c74b25",
+   "2476110d8ef6c1796ac24530470be511f78cb298",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "33d9214bbe36f7536f3a05746aaf119a8184550a",
+   "afb6b13cb43f039d79a33c18fc46f66f0e72c7dc",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
-   "fe4596ea07807e378c6d1873d4a44bb4fffd4c1c",
+   "4c6f5692736b31b899ea05e66528229f13811c2a",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "0f6a74f590f47e14573736be0d5e7ead2871f1ab",
+   "ba9f9a0efefa94157463531641347a0f456c0f8b",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "59fec560322965390742c15f93ad2f053e605ef5",
+   "6517df335314860093384d4d4ec3a48aa35232c7",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "c3bc39e7afcd0072abeb3c5585519740921c964f",
+   "4e15e43099d11170ee408229890bffbc044bf8e1",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "d6efd897322008bce9c38569af02bb390082bd14",
+   "7638b0adf61a26ca0ebe3543c8fa0aa5fc2f2a99",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "aa00c6f71d70b6a5b13eefd275f308f2fd6e6215",
+   "6eb29336a51b8d80d60537bd54591253152fb559",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "55083571c65dfb9c413a26947ab2b93b81f26fcc",
+   "1a8e73ce41b7e61cf8eee3bd23d1128969bed636",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "e1d4a6b3f2f876e4f8a0393224579fa3ed994da4",
+   "12b0d017daed5716309600030f02a56c78db06c6",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "6717cc2aa041f3129ac51e12897987b8f5e07c52",
+   "3ae13145cdf538d5c65e707fa754bbe61e1cf1a0",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "fd9e5863833fe25ac40b0e27fc4d0cd4454fcb06",
+   "219c254ad1b27ccfbebf8eff1c62210aeced244b",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "d7fd00050f69fcc98e437cfed96e83691d753286",
+   "7f3aa55d9d9f001447b6380d4d3a5544e9cf123d",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "21f16002490268304ff2c325fb1deccc487fbd42",
+   "e69ae0802d615b641ff3c69e8c5ffd2e5a5b4d47",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
-   "aac4a2a3f41c48c39ed79ea22f5515b287ea5c28",
+   "e199ae2cd97ab520d8148fe30a102809cc35ffac",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "7e1ce57dd77267ceaa351438d83e08aefa726692",
+   "2198438fa27ca7fe374916ab3812ce92c2f5bbd2",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "05b5362b4f5b1a84529635b2c1f1c12661dde52d",
+   "41e2e81b3ce87f5116028fab6f056ecd69b35551",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "8d84056e7ed3913abba9e031ea9cd210e0673b9a",
+   "b66d22e3da7dd41fa7b0210960a41534c0219b0a",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "e09f582d7360f67b555100197fece4fda3df88b3",
+   "f5c003efc762430b1c2285ebf742ef902c74e515",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "e4f4232ae8683b11d99776532e8160cd1a8a501f",
+   "8e91b249fa76c077fb0efc5967fe3466dcbaa14c",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "d3b557d7961e42cd316d6fb48a28abe9e26f1fbe",
+   "af01d1e1cac12b7e0d681aad24d4d9dda22788d5",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "c748f8c251ac862b23bfece5c7c838a76de75d65",
+   "99cfb54efabeb78167bc5dc6caf5942e7011eaed",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "7ff4aea0e1d2aeae9b7589d64dc1ef057415226e",
+   "31d98347369d073c7329748213ffde2a64afdd5b",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "cad3acfe5afea36245475a103573d7eedd11e187",
+   "528ebdd0ebc81f804ce883dfff832c2a635950f2",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "6975f78071b1949756c7707e9dc341a3bb3ea370",
+   "9a773233f627ec7f0c79404ea97b3977a7b90e17",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "b55f5379b4687948b76404102695e453b9199ec3",
+   "691f8033a86872ba77e041e0bf3c468a5c61713e",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "514baf51fc461d9754ccaac559f0032b994650f6",
+   "86386e1910dfb5abaf3baa5ad868150fe88399b9",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "41ad2badffa26f22f1a32a7be2e8bfc6fd0b7af9",
+   "2d1cf98d233e04179cd3cb634f0ebd54e94d3ea3",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "36c8aaeafc92cc885e57c8f0d153b98c90226072",
+   "dbf7e11488110b238e5e53ed750b06e7104f07df",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "6cee2216b9f397915659ff8c9c3181ab195e2bf7",
+   "078f1e84f48b447bb6c48a9af2fc12775a2386a9",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "5a67b55e663200dc5f885b1887355a5310b0555f",
+   "d304fee7032922ddb243b7e78c5f90b6208a06e0",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "a3d17dd1d0b6af6be9c79ac71781f09374250446",
+   "d03e37d4e9574e7ae69941482d6b067d62f41287",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "5a33e4c4b5020a9a21b0a4a9cbfdb25c5d9468f6",
+   "b07d53206cd1f218da89bfa5b184847c4ec42c42",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "c86db50d203a25386d9619434ee76beb7fc234c2",
+   "1593e0cb35845469faf8e75fb37c8026b2986f5c",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
-   "ba698b85d32e9045da7059c8a9c6d8ec3932e05b",
+   "33baa60317c7a75594d1b518abb684a368efc1b1",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "e153ebd848c1d748aa5c886cfb38bcb717a028e3",
+   "c31e2ae39c0f92a7063930952d9a2b4869110998",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "e1d04f843c40934b7980aff4dbdcff042090859d",
+   "9222a8c716ef579d0b78940bac7741499462eb82",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "4451804cd8cecf9a9a02fcdbce527c6d9adec28c",
+   "d8168c9bd1c2782d5810f9f95614ac6d6897d58c",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "ec8dcc3bb9fd029031c6970d7a442b53d4711f1e",
+   "eba59dffadbc392fb9c08a2a429e9ce0b50ee912",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "13d58dccf56625fa9dabc9a931b41f67b79b0465",
+   "d1331eb6d7f0b49ff34600d0de43e1c5642df60a",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "e7ed38632b1b99fffb0d78f383054dda0b594606",
+   "6c9dcdfedc3454008ab873f5bccf8acae4924334",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "ce744e0093b15d266dacd23992ae2201f0436987",
+   "09d4ca95c43b74841fefc8a51a8d9a7f38bfbaf0",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html": [
-   "574cdccc9b6dc4f06fa5193088361069c1fb4f56",
+   "54342e1433f568478fa667474c94c112a9f64c2d",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html": [
-   "f452387ad236f0b0486bc017d63f92880a9cd6f9",
+   "69775f37f6726daf515a424928c4668ce139e038",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "a70858c0585033e2f46fb80175b6b912aa1d2ede",
+   "0ad290b7edae496c8363a66405513fb04a07f7f1",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "621b145501934cbe5213267a7782ff5d03effd54",
+   "139ed4d4fc7844bedab70f9772815f538e8d7dac",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "134267bb13c920ca0ccf360e8311c4566082f84e",
+   "dcd8b45bbbb4bf7b5f2fc600c15555651ef9369c",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html": [
-   "f7b4c6c37e6977624da21cb5ac59c962fe4004cd",
+   "5e5ec8c220a0844dfcb0442db15a842558a59749",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html": [
-   "dce5baf64e0a7261950ef12879e135b73125b732",
+   "7fc74dda97ef810cb276b89ab42821d45f377a51",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "ff6b14d5a845795b058f6fe1b398446eedeed6cb",
+   "2d18c27a667e61ff9a8d272bfdc0bc186b0b4335",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html": [
-   "d2541d3407f2a745e5b273f671abc96dc36edf37",
+   "bca073ce3ff0015a9f745b2252e1e214e44e6d9e",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "74f1935efac3b45abb16b9f391c0d03bd9669ae4",
+   "abb708940f381c0a6fcfcee952d3adbce3b3f2d8",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
-   "2da8ff784bad94d9b7977635d86ba9cd7717f972",
+   "699544722421154f17ca340177ea6463fe681176",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "559862ade9901a9a3136a2e9370f58e6fe088b9c",
+   "4ff4f97ca7bbaa3876faee06d601420bcfd1bcfd",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "844daf18c8814172cad0bbaa320eb77c7fe796bb",
+   "4c74d8957b6cd223a61d568459bd686462819d48",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "293d8c3304b82162b468d0f73eb676ba1d635694",
+   "8d26b422dd8f527518f5f0ade939eac454258678",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "7571a86f52ee22834c6df053dbf7a4505b1f51d5",
+   "9337d1e45d5b7c05351f97a03740efe3114d9798",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "96939619cda2ffab5a83bd26df85f60a8b8d3d9d",
+   "27928aa098fc5083ffc1bd91f0aeca0c0a40a03c",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "c79814f0ec87d971dcb67ef95025fa25d3953376",
+   "07ddfbc1555d8cc30b55cce46d56ae0a4a6ad17f",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "04b4a59463f0b29d9c6cac7863380183bf8febbe",
+   "d60eac9d39ba5f4c47bfa2ed47b2cbd3abc4d28a",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "5c749f4bf9738aba3197cdd690896b61b53f85c1",
+   "dfc8c35b49f117117f17faf02f35fb16859aca62",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "5246fb54f55ca53aeabca3224a0edea423bc528a",
+   "cf4586caf02f3f06f968b16b29cb2cd10dad4049",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "3885e8a6a5a88aa0179f9a1bbc802c0823a0c6e5",
+   "0ab6410623edec68e49fd1548dc5c4d9633e8375",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "9de62cd2afbd6ef929cfc5459cdfbe2ecbcd06ff",
+   "53153eb74da4a0c94cc1782ebf496eb592658254",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "af9798b9c0fb69a1e93e4cd171a7dfef401a1733",
+   "a176cffd623a7be166fda59695a9e221861ee47a",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "36464436dea596bec11f29258de36c219dcc2764",
+   "1d6d93b81b703fa4f522bc673f881848ef35a04f",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "455693efa7eeab5bfa2cfdaa26b779e70565e15f",
+   "eaad1a0a98e8ba1beebddaeecc0ad5c37ece987a",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "25ca0138fa4798a94f6fbe9e05c7be6d6f5ca784",
+   "f1bb3cc7079b83d94957edc8871c6d403f77e621",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "dd5055d0e35ca29db583b2d492121950758b29eb",
+   "7aee747463a4f3e2cb3003cd12192d630970328d",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "dbecd94064eba3b30c40f811a17c74f7d0490a24",
+   "34e69f7c7438abf8e947834e98effbfae5c7a48e",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "c58c2c723ad203eeefd861f94c66d33b2e844670",
+   "42461c7c8291b6e0d92a08832d2c18f78a46efef",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "0b7655ace11cfb8dffa91a5499a4af987b76f47d",
+   "8e2c95011ff11b63911ecfa0046effbf84b07b9a",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "fe44085e3ee2fe26c765b1445131fe3148f793ca",
+   "76b93cb60d55a213caef25911751cca559280f95",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "875a8ffe49ed2c918e1cc5942b308f066eb1c73b",
+   "def23fdf12f7a5c3581ce4982b6b7a0b784fe41a",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "58af86ef04a660443e9fff78e19d3ebd9fec076a",
+   "a3266512ba4a92fd7ce6ae81ffa7e73e8286a773",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "fb82ab874ee24bae76c35ed66f202586b591fb0a",
+   "1c950d203e8d3c11791c28275cccac6f13dfe76a",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "bdabcd3f3bcdcd2124175914566b683ce000feb1",
+   "610a20c12696fee3bbae10c4baeb62e9b2225368",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "542395d1f3061f36fd4b3beb0bddf8e4557f39b3",
+   "f625618a1ae815929c0de858c9c8759ce043aeaf",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "178f813a614cfdd2bc6295751dbfd2d878e1239d",
+   "678c75ab7d45b7ab5e2028cd3d07f14e2c4737cd",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "ff9462ecbcd46f5058d8cf4435beb3ec675f0bfc",
+   "000ce7b3969f464544cdffdd719efdf7f0a9a9e9",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "a0b8c34f540ef3ce342a34cea0551ea7a1467b7f",
+   "ef883cab54daeea328dc7130b7e11bc97ff8a966",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "c5434c6cd00212786adbb323a1cf95025a0717aa",
+   "24510a06613fdcd581e839269aed5bd6bb3078ce",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "0531f45d3626917c74a16206408e53307280b096",
+   "64efe12111b0d61918c7d36adc73302259db1678",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "8691721fefcaff9046b8060f64cbda4bf3580c59",
+   "0f0dbd681633deedf1818767ddb826aef2c328fa",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "4d69c86dd1560e5bde819326c739892c8bf6126b",
+   "275e6cfc16f3c0c489352d75aaca8600991062c8",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "3330e7cb732a015b96b4892527541a023dfef201",
+   "343fecc8a78ca10c9441e4b22a72842e177b6dc8",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "f159ef61ee95ea67ca831c32c90a81194e982b5f",
+   "f648b8cf33e5df46d7df3dba70d33cb6c4be6370",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "890ab5be5d4604822454a2f21e5c7b5cdfeca7a8",
+   "e99813ab54325408f4e32406b98cd79f98e1c5c2",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "1dd2d1c1c2fcd6804c95c68af49dd053c57297b0",
+   "1f77326ca746aa7b124cec57398d4926465be824",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "4c9e15551ebfb36ac501aa84d0082111063dfcf1",
+   "91aa649a8220db068cb25e28dc0ae6e16d0edd9a",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "0a9f0a3af747c59153f769a46eae1506e5302243",
+   "a9d51a2f5ad7ed9795d4127ff97c9835ca237f8c",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "563ad1b91b8f71544786bbba428f9e4c60d3cfa1",
+   "c56bd5bc449877e481d03161aff5f1e8486836fb",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "1271218d08bfab238ff0d52ba0abda3ec6781653",
+   "e7d6a220827a69377dc0940623c432a6cb041c9c",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "a7b4ad7a5b9364f84a742e8ce701212cd3eaad42",
+   "91c171fa6d1921e8e6317fef09a0012d441ec34a",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "4ba159c7fb5c116784c9d15983e333dbc6f14284",
+   "5ff941231bbf285efb59614acb5ff9af0904dcef",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "c52392c324800f90c707d8729ef6fdbbdc3dbeb0",
+   "5b394487e18b59b7378fe65330babb795b7069a5",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "51c5c52477286e5d8399e24a7397552d775393fb",
+   "59f2fff31ef62e45faaeeac1a7328bb44da2044d",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "6edeebf3d75e1b3f2c90bcd315fd94073c74dea5",
+   "68cd8261ebaf1ee2c1045b7ba8b220a201b1156d",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "0276285cd04bbd9ffe5feb131cb058e2710a980a",
+   "93adb6103c8b249d2030a8acdbb93e8ee74094db",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "2760fdc1ddeb9952010418345a8ccf40c8ffe2d4",
+   "de49d97286f2411240f99766dee84884f007632d",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "2e65b4d125e446e91a284d8eabfbfb2d34c58c00",
+   "3c2855c9faa8805cc2704c7007585cadb8e5e822",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "639c0246bb838185183ed3a5b549aea3236bc4bb",
+   "0c7d14b0db36cd2428d165237cf04fb2091e9612",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "88db01292a34bcc6594920ae00a6fe527d3a5df5",
+   "64920f628190d0b97df877783a8ab308088b7aa2",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "2663e303da5cda53aca53410e483705b37eb8761",
+   "2e10439957ce001ff7d6bfd6b1897c3815298b21",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "11f22d858586a4cadd9c785f5e8b5ff1346fff81",
+   "55dc97173e88e4e12adb7421a6a5f098a0daa8a6",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "3ce8fa97772a81b4bdff71ff73e19b439f1101cd",
+   "d08bc429041d7c879fecfb78faf6208dd353c1ca",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "c17e9a8461c45038ccc7bc07ba1dca52cb42b34a",
+   "5c49deb29f51d417df7a7f36cb5053fa0b490f0c",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "d3a2a47288141420051558f56412ba49b9fcea75",
+   "eac501edc0981aea836ebca815582c87f9a18ebf",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "393a92a4ac0eb9718d2fab77dc0c5cfed0b8e4d7",
+   "1db72da39cfe2b62f2c5d4f48b5ce83d9c7955d1",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "2f2926b128c30fb39d8563a0595a96edbaabe27c",
+   "31aca378f6d32861a217dad870b450097a995917",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "34815f46112b4b9836bbbf4db544ec7c9c8a26ad",
+   "99902760f7ce1411c1160c0944c87c7eb0c7d989",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html.headers": [
@@ -659729,7 +659731,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
-   "57cddb7c4a9d526406655a463030ecb3019263f2",
+   "8f7caf149403ca017e80595b845023acfa521aa5",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers": [
@@ -659737,7 +659739,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html": [
-   "e0388dbf5e2eac9556bd6f8c79dec85040f3c808",
+   "0ef53d8e08a14a7390856c6faf8dc34ce9394470",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html.headers": [
@@ -659745,7 +659747,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
-   "a3355ef9732a76ce65eda548285b1d0bc95db665",
+   "a81bfc961598c5e55aa91352073b9dcf4674998c",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers": [
@@ -659753,7 +659755,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "1aed56a52c87e23d5258fe0f651822e496192004",
+   "db728004ffe4fee4ff0ea3db2bb074b33ef8dcd6",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -659761,7 +659763,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "4dc27f057f46617a242ce0a20ea9c0188f07a0c3",
+   "62a8de9b1212ffc18b6f53dcc5d9ff27b743124e",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers": [
@@ -659769,7 +659771,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "fc98c1d720a9a88f7e260240155a1a58a9f4cceb",
+   "a4efdd16e1c21454bd90da2b8a2c24d66389abc3",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -659777,7 +659779,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "435a4b7cb4fbb7a0131cbf5af58b32c0e05b258d",
+   "106e6eda1b4ae3003f4fced185342417dd7c17d4",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -659785,7 +659787,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "787e03d5b2eed8115867b2002f2736a3d5f37267",
+   "d1093145df9a9e124b83eefe7b893c11427082e4",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html.headers": [
@@ -659793,7 +659795,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "8dc6c82e1c1523f3755404e548477dde5ff4496d",
+   "d8d6b6eabf8f23514430e1c7ce264beeedb07e90",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -659801,7 +659803,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "4a52130cced3d8e7945dc828177e3785f7e858ce",
+   "60d19d4305f4c6454d04895e87de308ae2ff168a",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -659809,7 +659811,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "0b5fc2178587a841b54c25658a52c30c8d075326",
+   "9b31ed7bef641e37c7ded5ab68bcc2b5f40bcc92",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html.headers": [
@@ -659817,7 +659819,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "5a47798f03e185c150fe9ce3905aa9078c728467",
+   "7990117a90400d4534050cc58a688c8715e360ea",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -659825,7 +659827,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
-   "5fece1114a6a6add14f163edce55f6e71f1f61a9",
+   "bb87b5bda2b6238378c52ef1a94429da020a6559",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers": [
@@ -659833,7 +659835,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html": [
-   "f3921aaf56dfe7989a13cd8423cca1ff5596a7e1",
+   "b4ed0577d2cac23fbb7769b3bd209fa17c43a24c",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html.headers": [
@@ -659841,7 +659843,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
-   "04ddbada0aa82e81096211827af621b767cb9106",
+   "36d5d03971a5d5443c666ae7e5042f0c9a0dfa19",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers": [
@@ -659849,7 +659851,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "1d3f7dce1f976175227d86995ebbd51fa71f125c",
+   "ee6a4b4ba23fafc9fc2c33d5060ed1d3f61eb564",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html.headers": [
@@ -659857,7 +659859,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
-   "68528a3d118e375b7136763ea03f786e314170a8",
+   "d40a7ac85810d9969a0ab84f15539163ece2914b",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers": [
@@ -659865,7 +659867,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html": [
-   "0485112fb137d689b16fbe10700b87d5975643fb",
+   "d65fd11b9c83fff9a9d9d3c544c86f98496659e3",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html.headers": [
@@ -659873,7 +659875,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
-   "c2ae6abed994767fa5ab1e34bc537efe13a1c72a",
+   "8f80e8154692d779a0ccd2941c89150c746b660a",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers": [
@@ -659881,7 +659883,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "43a2c9c6fb803d25c7d760c98674fc09a568c1d4",
+   "5bbfd0ef4a15ef7f11b391c4a13251f0ade9befa",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -659889,7 +659891,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "c6fafef57351261944b75feb0d8e6dc3eda15ecf",
+   "a0d023540f2212f2cf14f22964f23020e8d7c903",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers": [
@@ -659897,7 +659899,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "d0b61af2ba9a78aa9664c3315b1f5f8d56183f0f",
+   "0515d6436afbd0a64e972cd827524da861f7cc28",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -659905,7 +659907,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "07949589bd712f1cabc2017326995972d29bf185",
+   "3d1bd73fb7a1e535f1e617a98eacc028a30c06d4",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -659913,7 +659915,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "325eaeba031d39bad345dbd6eceb73dc97ce475f",
+   "f13681a35268f13ed15a8e6d6a0df49f5e158c6c",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html.headers": [
@@ -659921,7 +659923,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "b68a4e51795a3066ff61a8a4abdef757716fe575",
+   "e1ebe43e3916f1dc6458474c6cdd5dbdc50caee5",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -659929,7 +659931,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "8f8f01f20fd9438a7d3fae2bd9165c7cf99eea2a",
+   "bd6869a2baa02bedf5406126d2116c01b0be2495",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -659937,7 +659939,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "74cf6d4e792376bc2be2baec352106c914f7fb2d",
+   "3d9b9f132ce79ab77d4c6c749035803ab2a3cf78",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html.headers": [
@@ -659945,7 +659947,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "57c858aec840ab4c21757ff015524b2a07ffab31",
+   "1d35ee33a7221a3ea86d6bfcfdaf2b791ebc8199",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -659953,7 +659955,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
-   "097b8cdd3f05546329723da4f3a2346cba6897a1",
+   "44011453965b809c72962349adf81d0f836e096c",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers": [
@@ -659961,7 +659963,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html": [
-   "c53cf0d94ef79d12acfaa574aa14421a3acd5157",
+   "86a68a6727e599b92a4354211afd4b1ad6d3034d",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html.headers": [
@@ -659969,7 +659971,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
-   "a9370a998dd7f625820c8dbf9cf190bafe31e1db",
+   "df3ab816891e0adc40882a164f778f91ae476e56",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers": [
@@ -659977,7 +659979,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "713221d297a91809b84a0f6be3e8c9f42ee3c1b2",
+   "f1422ed24cdeb8e671e9ec0d23007e621c81592a",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html.headers": [
@@ -659985,7 +659987,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
-   "712a2cee4eef1c682097e275b2501d099cf37efb",
+   "cff3a8801ff1217a4c03101b89fd07df28e94196",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers": [
@@ -659993,7 +659995,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html": [
-   "db4b684c794478d545da174748410dd2cbdb80e3",
+   "da2c5b7e1f5d5e6328bc01ea99d79a61a5b31e99",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html.headers": [
@@ -660001,7 +660003,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
-   "334c549171be49acf4ecbe699f9d9a541a22853c",
+   "5f3514b0b4661b7c920cdccb54b96a674eb6fc6f",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers": [
@@ -660009,7 +660011,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "9a38440128a7cc0779f1ff33d9809bcc4e877041",
+   "bc6d22ad5075d0ef5129a7ab31fd91d43d269967",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -660017,7 +660019,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "5e8d81c2d042357f7ca70d64ca8f657e46efd79b",
+   "1290c5100b6bd34b582cae98d979579ad51b88e2",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers": [
@@ -660025,7 +660027,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "a49ecda4db78dda0cccb163bd03aac99f3b6d4aa",
+   "c903683a81ba3edf30cda3dbc2928c4eca3d8cac",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -660033,7 +660035,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "723f22630c80e34a5d3305b22dce56aec548f6da",
+   "d940f08389425caa771f2635cbf3c07bf4114ae8",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -660041,7 +660043,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "c11e69041be63c7b5190ffc32bdae361fd12fc81",
+   "ddd50e267bc838a372249dc5048ad0ce296091f6",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html.headers": [
@@ -660049,7 +660051,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "fd4612effbfdb284f38bbdd55777e373259df936",
+   "2ef7ddeffcc42dd42b4974a0b616f3d8324112a3",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -660057,7 +660059,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html": [
-   "b18fbef56a84c969c71e014e28d7cd4e8e984a0b",
+   "b9e3c4b3f0d4d89af73bf144ba5d322df56d51f3",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html.headers": [
@@ -660065,7 +660067,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html": [
-   "3edc386aaa29596a1d61b9f37b6ec03a5cf990f4",
+   "9ec62aa2d1b3be5accb38c18835010e4b85282c9",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html.headers": [
@@ -660073,7 +660075,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "4f12853c0fcb909db6e403deb430e835cf229b38",
+   "303a8d0182413aa8a239f1b897ede082d551aa77",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -660081,7 +660083,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "52d3ae1264cbd0413f42d87cacfd012d692a4e39",
+   "f7e1767c96add5ea6e250985b8adebbd9bbd10e3",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html.headers": [
@@ -660089,7 +660091,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "cb20e18af7c23b9b03da2b0b5041625a9888d1e7",
+   "635660b9017dc3e75b964b9b2826234da431e185",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -660097,7 +660099,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html": [
-   "636bf3735b1cf7edd969e0b9d07501d9c827be1a",
+   "b2f2be724c159537c71ea03bde146432304aeca6",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html.headers": [
@@ -660105,7 +660107,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html": [
-   "38473b34702d43a771695c4b1ec78301b82c11cd",
+   "234103dd8f7cf6b73a98a93cbb046b4aaadbd474",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html.headers": [
@@ -660113,7 +660115,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html": [
-   "e0d3bd0faf8ab80a11cf37f6823d68e000d913c5",
+   "c82c8a4e9713bd117693a4975db3d87c9850aed0",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html.headers": [
@@ -660121,7 +660123,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html": [
-   "f6a5f615bb4e0f2c58520140546edac1bf72fb69",
+   "32a281aaf9a50569b32455524a1b98d5c04dfd0c",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html.headers": [
@@ -660129,7 +660131,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
-   "8a49347b7b10e19d83e7d20d94d50126e70eab1f",
+   "c69b1e7d41b9fbdbd41dfd6049e48bf663457e44",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers": [
@@ -660137,7 +660139,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html": [
-   "9ab2958e4b777973bfd2ea38f14d11304cbb3864",
+   "9568f28ecdde56e7e18d3ef739a92f44a223ba9f",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html.headers": [
@@ -660145,7 +660147,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
-   "bda2e617536c6846c2665cde932d1e302873f9ab",
+   "65b43ac75cbd8bc6eab2d89c51c3807628c7650f",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers": [
@@ -660153,7 +660155,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "131a9c07803a9cd4fe39b80c804445522e6ca8ea",
+   "76805bf942a7cdcc422d50f6e77ea4b8363bba89",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html.headers": [
@@ -660161,7 +660163,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
-   "c114a3f8a85031c6968d59d5698f16cdbafe7115",
+   "e497c4ba0aec793d1d1aeb7c07e02ee762757545",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers": [
@@ -660169,7 +660171,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html": [
-   "f1dc1238a12092b79132b04e148e1c11304ee7e0",
+   "f2515906f5837d2a940efc75ad2cddc4ac2ed60e",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html.headers": [
@@ -660177,7 +660179,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
-   "44e0199f5b3dc1fe08c16b2a09ed26d735fec39f",
+   "f7ca726736d74dcbda22a1c0a6276e0381a57d9a",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers": [
@@ -660185,7 +660187,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "b7b1fc54729ba61ccd39db18f456889c081b7f58",
+   "995443fbcebbabfb85e44db2b7a168354e85ea75",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -660193,7 +660195,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "216a1e6cde3ee33146d53ea569fca88cffd3db9b",
+   "2c6590ac4b324bb0d7abc8260e8e9b484cd50ae2",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers": [
@@ -660201,7 +660203,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "355f562c1d901e56ad8c3403ed74dd2b59e87a5d",
+   "5334977c62db45978d9b659de220c2ce03b8a578",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -660209,7 +660211,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "e6154259563301c96151434d7f123705e31e2414",
+   "db04564136b7d39527b0217776a6ff8de5dfb893",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -660217,7 +660219,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "7170884a6e3daea2abbc73e5db613239c78c74c1",
+   "d4672cd6dd42b2240bb8695a6177da9860e94059",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html.headers": [
@@ -660225,7 +660227,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "65a9ba9b7bff9a66af1381087a3b3a07a2addeb8",
+   "eb3a48481c3e33b233cbc36c704c9bba1c947e75",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -660233,7 +660235,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "20dda3fe160f30987bc08b9265c82506c7bb2fee",
+   "3f28ff207990f257ec9d8fd664c063a337228cc2",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -660241,7 +660243,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "9beec5d648d17347cd5ce9c403856a8dd24b39b2",
+   "cebab2ca35c2ff1d3748c8c0513e1229561b44f2",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html.headers": [
@@ -660249,7 +660251,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "d02fce2bbeeb22731e6bdf986d550905a4af7de9",
+   "05b25458fe010842c291f6fcfa4f9d2188b0d755",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -660257,7 +660259,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
-   "ec472b264cd3e2c2d115d18cfd22f4dab675137d",
+   "7dff4f79bbd20f8622867a8a5d74369135b2ce24",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers": [
@@ -660265,7 +660267,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html": [
-   "deb8d736bf486ecda9de896fae3d1b0483a25c6e",
+   "bb4388c10172851b53d87fc25ba03c77594fa8f9",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html.headers": [
@@ -660273,7 +660275,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
-   "8fa40cb48711c5f6fbae9c97b68ab2eb7a1a3465",
+   "f2a7ddc32962121896b81cc5da47d05ca737765a",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers": [
@@ -660281,447 +660283,447 @@
    "support"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "4f02037581d61044109b9391a83bb0ff17dfca71",
+   "93289f82c18d4aaa8e00d36ae5e94ed06a51881f",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
-   "bc1c5021a70da5b8ae361cf1f11b7b58d8175013",
+   "26d52678563ce794d6e35cc9b810ebacf5d3aaa2",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html": [
-   "7b2c327c32015d8931a116150b1d19d7d7c0029c",
+   "7e483a269035b5a5ff89bbd77fbafd1f928cefe3",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
-   "e5ea31157f48b7ca3118e7a32f61cb2d0d36edd4",
+   "c06245306dc6d2d301ca26982e05a02b4ffef2a9",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "cd54256ad03730045a6546ba4a2d677dd5532cbb",
+   "fdbd90e2f820d631446df036b85c53f9d5084f54",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "84b7c650fbf213db54e25c3644ff17d5e780bc13",
+   "3825e542977556a02b168a995e7e8b0d1a9141fa",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "b9e130b9623c49a1cedf213739094566b8d85011",
+   "4d7d1e02d9ad495d1cd99a433641a15ca2718b61",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "ee64a3991678e54101ace14da67a127f687e3348",
+   "5d5c4a021bf71cc52a64e7f0ea60f23172a61392",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "83168afa28a24049e903cff8500bc9c7313c32be",
+   "e0ec15fca9cfed01c14e0b84b49ddd5814b41fcf",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "6e624a4c00610c1d51cce3b5c616c50d28178088",
+   "f803cc2e72ab22de7c633e5a13ca4670b8d88211",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "206283f31617b93fba55622b8b5c0d2e40a27da5",
+   "4365a3afe01ae63a5522d0e97cd7e415e4e805d0",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "c45116994e3e90d1d2d3f10f80e8b52a9530db36",
+   "637ae9566e6571da6d2a3c3a8394572b28ca4d7a",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "c4399815df93f6dd8f0b526673d1a7166f9e37e2",
+   "fa6e076d365aeaee8349a3396109d1cbef928fee",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
-   "29831095ffa45e02c388b74dfb51fdc7717788fe",
+   "1b27a92e3da8b0bd3996b304c6c19b1f4f30e063",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html": [
-   "488a26b4330651043b9dfb9204af89a7bb9221fe",
+   "8185f0002716f48eaf47be74194862853c4d851c",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
-   "1cf420f9338f72b42f04d84c093c259055a47741",
+   "5b2f107682eef3c0e4688d8f3ec8b80c23612c78",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "31e5d1662cc3da3dc1ae67c89538a52a588dc5e4",
+   "a82dc84b109912a5ad48d86f1919c863c59575fc",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
-   "15ff3f5ac478f49d34a3b3ae36c18e72df9b42b7",
+   "c9fa90ef0b8869c9352322cef269975fadbc4743",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html": [
-   "0dd487b42c73b97b632c8a270fabbeed83d1a154",
+   "4765b57cd8d9da0112b761da8dd38b13406facfa",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
-   "b48e453103fa3e49e8a564ea1475a439a35e844b",
+   "1bf43d9a4fa77aad01af879bb87651ac104298fc",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "ba04f94ac0756ad03bae6c3f891cbf0048c7d6f2",
+   "d71c10f55ef8b1d0ca8d567cbe43b7b77092c4a4",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "b35d2db838a1f2a86ffee7872bef7883c757ac8d",
+   "765c59ffd9df960f05b78ec03674700645f453f5",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "e923921d1501f865abbdce06c87c63c30e10d08d",
+   "375e1d4231c01c58618ede268bedb27c7ef7bf8d",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "c1b54abd4bddaeec954217085856141927520f16",
+   "587d613bbdf14c73b7f88622baab12091f1aabb4",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "3ce103711560c80a1d9494ce9d0f2df08d56d1a7",
+   "58b04f610da6276c4dff14d9d3b0f2a982c65428",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "1b4719a32c65f1ee90c84e98f185288669a7543a",
+   "046b05f8b45270d6b6126ca94d4cbd57c8eeb50d",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "b83af76c638b27cfd2ea80e385e859061ba6523c",
+   "5f8628516a889a3c8df2a3711a20b2a05c287214",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "a370ed358851c0552ebb2c9d5436c87d4a76d244",
+   "fa09d764d3b5367acfa1487ea11a2b4236fed615",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "fa2e7a8f5d0d9ae28a5868f2d1a159ef598911cd",
+   "f0ceb06c7cf9df731c9be66f899101fa2458611c",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
-   "485702bc2345d1d9f3c887894d79505f9ad1e31f",
+   "f6f7a8a8477c279488ecce2f7f03fe1a19818e15",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html": [
-   "c412dce6cf1a6fcda03770a7794cc4c846ef6c5a",
+   "8bd07880730a7834bef2564f449b87c88b05c158",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
-   "c1c32ba312c9eee601ba95b16e94b08f233ef017",
+   "0216050b5aa996a9525e67940094e43209faf183",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "1a73ec9e9590235438e48224aa41f94c10e0ad66",
+   "de157bfd629dbd4256deea985c96d97a4234321c",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
-   "852b2a7ac53c0343b4c9906fec1a660fb7924bd1",
+   "71975a01784426670392de7b8a4efd39940f2a74",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html": [
-   "fa18f832d73a5db5f97a82bc472575e6bd3b0596",
+   "ccddbcf5056c3811978ff3801a3abfb55bb41abe",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
-   "e8a9e5144143224cb302b4bb8f3feb4244afda72",
+   "f035f115030b2a883461db6eb4c64d21a87e76ab",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "7932dd8bb57c876a57017c86286764d882f586c9",
+   "b05eb93ff6b36ae23742d0cf49d379c78f947b28",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "324251c10f1879e01d11c4cd8097a0695de1b78a",
+   "d5dc7e24c1a9cb3f6e39a7469ddb11b0d1c57a77",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "67df3bc8fcff4f8de2a91a73d70e3eb2422520c3",
+   "feccd9a975d2d06df4cc368b05038a8da2bcf7e4",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "9000bcbee23dfbd351df3e5cfe066ae58b1bbae8",
+   "f0e0db6e04a75a825eda1485c5e42444af9915d2",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "7f5cb7c8f9f31faf1a9060f595a1b70df8bf13fa",
+   "362bf8ff28924cd6b1850272580d287f8fa88105",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "ea981ad14d08b7fde416e46ee26258ee80f566cb",
+   "43704298c33e2499351d033a125c3b13567c1e95",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html": [
-   "ea935b1d542aae46f105f6be8eff04d448a868db",
+   "643174232769e68bd66cd1cb5636210ffe11751c",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html": [
-   "e22b638b5d16c44b9c5d58ad72e7e3ab29124079",
+   "38d05a3f563f03a93fad9644b69366ee7d42d26b",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "222b078cc664e0472642788c35238e6d29ef2b1e",
+   "fd5ce02eca1e2f4a4305e8955168e35b1612557b",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "3c1c41cda1a1270a2cf9ead008cc45af266487f2",
+   "86526c3f5ef9781bb163208954ab3884ebb03463",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "954dede4acf594a3f537067e8f714da70f4a9887",
+   "a9135e537c02af7bb6d4c0340af1d7b5c6200856",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html": [
-   "d2fc88f0bf9bac5922869797ba2a40151bcdac5f",
+   "2631486b1db63cb781d5a0f80d26410f2c513585",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html": [
-   "6da08e2e0e1e0ab911f052f33f1a0260472dbe56",
+   "74c932ed4a3632a2f3bd86692a3c70bb34298d47",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html": [
-   "b9ac0adff0d2afe568e745c864a691eb61f584bf",
+   "1cd5af2177dc3f3f54652126b3d644677b4dd847",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html": [
-   "1cb5b30bafb80d888691b18a57c9181a835c37e3",
+   "500eae542739f3446afde97bcc97da6ef86e409d",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
-   "b0528816da0f836721b5e7562b8c81e72b3fbfc5",
+   "bfce0b6d8c08cbeb7434898ecf9df6d9dc70f235",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html": [
-   "524e650e983b463a1e045a458b2b33e3afe17460",
+   "157ae0f93c04d755a39a78ec00fa211651377005",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
-   "0b6580b2ee3ff482b75e6cc993a75ed9eedfbda6",
+   "e2b004a80879c8f3967281eafc14ff73193ed2b9",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "7932926619c63e5382d31658280ddea2b1c29df6",
+   "cffa02a31355a14c00f7ab70932725fc1881dd2f",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
-   "5c88dcae2c9f02d6a0f78c6d843a52a26389afb7",
+   "622f2bfe56eb6c638064c4a84e599c23679534ea",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html": [
-   "2a83f8cc91ac883c5db29de360f8d43f01cdeefd",
+   "44e6203fd1700bcf9f1a9febc22f7ca50fd2ae54",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
-   "3714b4a982fa23b0ebe1f3f96ce7daacac44256e",
+   "ac1ec15f433d1295954112a65236f9a275a32d67",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "57b4df568c2b98caed37e8b7c3463b42ad446d2e",
+   "69224666c6672aba157cefd73e03785db1eccc39",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "dcf26139b43c164fd2de5c0c1c2c5cf80d10f375",
+   "eb74c6f2b96acc0e042820f29e559d772b2329af",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "070d4283a136fe3a6fc3b56a63666e9826ccd050",
+   "79098e561dc9aacfd3ed11beda64e6adf8335258",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "9da6e448ba7c09a36f1af9da557b5d75d7a78dba",
+   "be002de7b2584dc1e9d19ffd9a09f244728c13f2",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "2159b24e03fda5314534b3d94208235410b14152",
+   "77e3b3c11030788140d4353d9374305aef5909ff",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "aa032ca43e34548ed43c180f43382f74b444a72d",
+   "151c44ad31b7fe09801eafabb91adda1f7adc95d",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "6e0dcd4c2c12fa1e2a498acde933a27910e601ab",
+   "368ad71f83cecd2a59bad98fb64f782e72d39bd0",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "25559421d06343b98a10e1c60f58ef97337566a0",
+   "6b96346dcc7661ab8985b1854d08783601c2cf9c",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "04bb56842b712727ccfdafec2e6f97afecda831c",
+   "349ad20460951dc3e72a6e9c10da74ac0fe4e10a",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
-   "da806358dbeafd15c277b5bfcf7c688bbc370889",
+   "be53cee6f8e5d230ec3d33b5a7cb0fa7f4091e51",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html": [
-   "253f15de81ca705e3747a4be63ad8873e3b6f740",
+   "f8da5cabac830403fc78e6c5169e01ab216fb1de",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
-   "3b5271935c29c5423a41cf6a767efb9cefdee31f",
+   "c3a50470784b2df8e337de3a899b9b4523a06bee",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html": [
-   "822706864ff0702fc1d2af1f869149174f4a6ed1",
+   "b3ab54550792ff97898aa980e600c155dd6cdfdd",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
-   "9455ed856d3658170f42f23858bffbb1ba27ab60",
+   "d4bf7a1f1dec563620cf029b8473b11a9d7402e4",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html": [
-   "a6512954b88cba17d7d12dfebb8479a3af146994",
+   "d762dee151ac79d94bfccbc7119f332c6d9e6b39",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
-   "af8c262adf25570688375dadb7ef72c1f5a72305",
+   "c9d1b4e49be016615dfc4cc1a1893d9c6aff159c",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html": [
-   "2b634b85e40621d2000d7272b686d87a1afdb38d",
+   "927ee8c2e2f8498fec7231f841ffda326f44bb72",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html": [
-   "42ed329bf253569ab625a56dcb45548b12ae7bcc",
+   "a3df64017d962623acf9f87d2f104a484a7a6076",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html": [
-   "9e78e962ca6a21634e0770d30fb58940f35dccdd",
+   "ff3342e75ee8758cd7431d14054e8a9135224326",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html": [
-   "d34b4ae25bbe696408bafc0a4a57e90fb4ca9400",
+   "74205b4add2e42ba8299ca425a9c67e64fb0ab13",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html": [
-   "f8a200230bb1e43537d262c92263d63a4ce60033",
+   "a303873f893b47a034df1dccf382aee626c44572",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html": [
-   "38a61d264a7b2b166b5e19792dab2b3ab97df227",
+   "4c6c29ddfcdd6bc0d930dbf4724ba49f0b8642cc",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
-   "0626306d65adab6a2a81496c6afc22dd8d91e489",
+   "99144cde54454e4ea754549418853a372508d6fa",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
-   "f0dd273c32073b95c33bd3266b1e52a97207f16a",
+   "a33e68004bb425c46da49f89c94fbb3fcc0a08c6",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html": [
-   "0687cc22f529143631d3041c68c2ecd9f3f47292",
+   "accf8eb7510f2e1ae9b5cf55ce810939de3c4061",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
-   "7b6dd7b981a4dec3f22cb933eddb0b5179826454",
+   "58aa461d790d84d3d53badfef3f765a66fd318d0",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html": [
-   "c371ce99322a6f0aa65be9d6ef704038c4287717",
+   "9924d010f77436e68be4294fa3643091e66d4deb",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html": [
-   "5bfef0ff661c84625940659b37ccdcb18668da48",
+   "421dfc01dde5a5d75226516165fccfa1c2cd707d",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html": [
-   "856951865ef647dfa5d7148aafccd51feab5c267",
+   "78f45838ed89e0cf575412d94255ad5091108e06",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html": [
-   "098b987b99d24a75619819e29b66f943eb48eb3d",
+   "6bfcaa405804868055d5363567cef5e974b80e01",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html": [
-   "2d8217031d188a2d994205f97773ae7805e97e02",
+   "66360f4eb4bddb898b93f4ec68957095e29b37b0",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html": [
-   "fce7ad9933b5f292f7d35626af8b142ebfb15bcc",
+   "19daec1b686e5c22774cf0a90ae548913e3f5668",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
-   "eadb3d1d614d68b1503efc2e7755b4eb3d1e0853",
+   "db98a1c7e9fd04d08bdbe29ed1f729cdf34acdc6",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "1bcb41746d72c8752ca5c2cdf3b9bd2cd4f07817",
+   "f64f19a72683bf7b75bec6c4cd06a15ef32d2337",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html": [
-   "8f3c27f7e6dd78556656999ab67928dc92b9f58b",
+   "390a5f5a8b2f7cfda326098506f178264cfa3ea7",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "6633b43a0efa4089324030922fc0fc59cbf4ba6b",
+   "cb9953893e2aedc64f0292cd913aa1deb3605af3",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "36941155b106ac8d5160d5b24d46b07ffb3fa333",
+   "b9e48fe218733fe9ad7f423b1e6bff5a16d287ae",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html": [
-   "fc05b1e52c386f8cc199968e8548255dc9c3639d",
+   "91441418f7392e796ef32d16954bb4afc6787b19",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "56560123ce3b8063a47f062fc329eb0c5ef27ff9",
+   "fb3699920a178396923d9610b1aa70846c730b4c",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "318ffd577a2c089aac3a8554f23854a08ec313cb",
+   "b5209c4858d10ba397c572a69a6bdbc2ffbe3ce1",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html": [
-   "dea7ad286eef04339ac51b1b18498bda72b2ae28",
+   "e725c59f612a0f2c60054178fe24a7411003f150",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "46c715d6aa2fab2b6345ece4d0ce38d65249e2ec",
+   "50ae40ee38c0d08f5189fa011178878294ac5ca7",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html": [
-   "12903c4da403b797c832766934299f2b30a88740",
+   "cd50a0c73618783b0b770b181051d1c97cbb7768",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
-   "ca0b0b1b5f564ae84b27ec1936877748dbdde05e",
+   "ce16bd7550d13cb193b85e41939da46c19678916",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html": [
-   "19cf59322f7b43bce60f590bbad7f676316118fd",
+   "50e426c1fee8f8518a2eb6fcab0d096e9cc86ac8",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "77452623c86210bec379fff66b51d97eed4a4c6d",
+   "ce5af8884f8c461e390d3002ad04d3e5a5fc414d",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
-   "f0c9e6fd969c134b09205085ba9e6d6c60a8af01",
+   "f089bb5418f421feecfc8713c19c1e939dc2c2e6",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html": [
-   "2aed178fd08aa081f22be120bd1db62e04d05476",
+   "080b7afc6bddf1b54a08a9ed3e22888e3df51ba4",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "4e184519eb8b6f4cda6380dd8a4be8edd5311ac3",
+   "7bcb5d59a582ab2b73753697e93d9a713e82cbe1",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
-   "9063bbd5ee5091664415dd6b9024c2d2397f4f8a",
+   "4bb082ea49f87e43832987f79d419f660130a41e",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html": [
-   "56bc742d64d4661438e07d31cd7884b72c711c65",
+   "4da9437134fd36f5ea2cb32e64ca6b14733fbe19",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "3209c5beebf69df7088635450351131464d34e94",
+   "c3733730a056eb543d83920eac3c36e44a6c3f43",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html": [
-   "d78b7146cceff8e134e44238addb4c03d88eef85",
+   "9f902d25220a523c010457cf11e0a5bf492a8676",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html.headers": [
@@ -660729,7 +660731,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html": [
-   "f4902bd2726be1b7199c9cb69efc4430b0ebb20b",
+   "a0aeaaaae51434cf0dd01bde8d2afbc18c184870",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html.headers": [
@@ -660737,7 +660739,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html": [
-   "fac6166811f64d0d89a49f9a3b82be30c1c690da",
+   "ad6787e78f7ab50c91f3e915365be72a340be380",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html.headers": [
@@ -660745,7 +660747,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html": [
-   "7385003cf8a602eaeab29562d47376447601fc27",
+   "4a00eabbcedf2b15b8ada4d21f6dea3e321bc7b7",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html.headers": [
@@ -660753,7 +660755,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
-   "5e3a82f01bdfc363e35666376c43c3796fbc1f71",
+   "aef8b034271c42f7bbeeaa46f77bd6c99a40f031",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html.headers": [
@@ -660761,7 +660763,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html": [
-   "6eed1d7792d6d064d0bba0ac90d88f6cb03d91ad",
+   "174286a0f9c080990a442c2ffa09299468e085ee",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html.headers": [
@@ -660769,7 +660771,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
-   "cc3f2c42a094a3a1968f34db80da0c0a6d8c89fd",
+   "3fc318a61f70269d4bd98744e43a593ebe542bb3",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html.headers": [
@@ -660777,7 +660779,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html": [
-   "c9f973b9bfb81fd3e220bb5197f5537815f6e495",
+   "347ebc1f5ef326d53d930ee6afe89c81ecc9856b",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html.headers": [
@@ -660785,7 +660787,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html": [
-   "6850d329d048063ce9af71e6fc6a80080ad74045",
+   "9e3c50929b6805b56cac936f0d6e4f707ad8c527",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html.headers": [
@@ -660793,7 +660795,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html": [
-   "a27a2ee4e04010df64b133ea14253e7bd36987e4",
+   "1437c09ff82950ea38df8b2af60f88f187de02d0",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html.headers": [
@@ -660801,7 +660803,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html": [
-   "67a7335ef210263ea8893bb98af4c1eef6b7a873",
+   "894f2190227b92fc976819b208d81faddadc2e73",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html.headers": [
@@ -660809,7 +660811,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html": [
-   "bace413985366d7d3ae3d94ac79db6445df38141",
+   "4bac2f3592018fe588b0ca5b99f489b473db5f86",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html.headers": [
@@ -660817,7 +660819,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html": [
-   "ebedf9e28d125ac49c155a091fcabfb3d16d4079",
+   "ca8069f30b5571a97b27c63c115e0ca6c435e9f2",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html.headers": [
@@ -660825,7 +660827,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html": [
-   "58121f98f3a59d22aad89681df746df5ac8505eb",
+   "0f50430ef1c0ad5819b518063e2c26b598311a6e",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html.headers": [
@@ -660833,7 +660835,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html": [
-   "7381c138364a065d8bb38ff6e976e67411ccde1f",
+   "036b2a536ebebae41b91608fc5a6dfc7911f8f82",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html.headers": [
@@ -660841,7 +660843,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html": [
-   "5117e3dd82aae7afbfe044a3fb1dcd7c433e5cc9",
+   "361e380f85edf5e04c64468e7b9307c986e1b0e4",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html.headers": [
@@ -660849,7 +660851,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
-   "637ed02656ef79409e80123fa1ec8afae0a46a76",
+   "b99ccab0779d1985853f7d2cae1c2604b8a34a27",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html.headers": [
@@ -660857,7 +660859,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html": [
-   "20fe88fde19b659b5fc0a19add0a79ef68106685",
+   "0fb80285ebb5c65addc37e42e0c65ce9baad9c68",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html.headers": [
@@ -660865,7 +660867,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html": [
-   "224fc53a05ed806c41c0aa508a5189b1bab3ceff",
+   "302bd2405795292c32007d4494757c7b95424a1b",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html.headers": [
@@ -660873,7 +660875,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html": [
-   "856662a7799b26ec85ecb75046e3b05d706a2340",
+   "e94605844b4a849d08139971b6990db3e3196174",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html.headers": [
@@ -660881,7 +660883,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
-   "17f78140023d7b806588254c5c13c09dd8417a82",
+   "e216544db00300e92bc1366d76c23c10cdd193b5",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html.headers": [
@@ -660889,7 +660891,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html": [
-   "53d9a70441152d5cd1056f866e3867f8239a0ac2",
+   "c9a82a7ec97a0bd5825f01bdc5c36deea300eac4",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html.headers": [
@@ -660897,7 +660899,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
-   "423c8ed2078d6e31515fc0326e0aad99165b712b",
+   "ec1aa5fe20c779361dd664851b00c7fbc37d0abe",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html.headers": [
@@ -660905,7 +660907,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html": [
-   "790b68586f7798f9782859984d8b11d552cb1189",
+   "21e76cbb71f7bc80a101cf380c75e69e31e7903c",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.headers": [
@@ -660913,7 +660915,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html": [
-   "1dae9fecc53344e782edf346e6093f08570a7655",
+   "e70bb298ad2358faf749059c73d6bd63ee61131b",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.headers": [
@@ -660921,7 +660923,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html": [
-   "75644a3ccc10e86af6312740be65f586459a9538",
+   "221f559302eca162a9f275fa89c965d3565c8bc8",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.headers": [
@@ -660929,7 +660931,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html": [
-   "2a226c6e18a1ded0d360ac3b922943cfd4b4b876",
+   "4231bf5a5c4d975784722b4bdbe5e880acba52e5",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html.headers": [
@@ -660937,7 +660939,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html": [
-   "e1c3ecd128600474cc77528a798954147e2d6a79",
+   "c52248944d9c0fdeae51ade65ceadd19071de608",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html.headers": [
@@ -660945,7 +660947,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html": [
-   "edd101a837e58fed13c0e1232a3200a8c5fd6601",
+   "f52c97603adad510c83c7c11895c5e99bc95b412",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html.headers": [
@@ -660953,7 +660955,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html": [
-   "37979395e124c1f9a2ab3522e14b39387787b695",
+   "3260bde8f75812e725fd38dbbb51321354f46332",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html.headers": [
@@ -660961,7 +660963,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html": [
-   "bc7c6d02d50a40192943f532993572a6c6c56f54",
+   "87ef4d3d75f189d2561270696c6240d33e1c8747",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html.headers": [
@@ -660969,7 +660971,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html": [
-   "f9fbbbc3233eac9004ca814b0220a7b9a0785dc3",
+   "f3dbd367410f89a2a6ba1e5afd9aca488e189754",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html.headers": [
@@ -660977,7 +660979,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
-   "f481aa975e944ce312617f92790638a610514331",
+   "aed37136cba5c713d009ce878a99bda61ea05249",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html.headers": [
@@ -660985,7 +660987,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html": [
-   "6ef928b6e1930a2a34e08662aefad1b37adc139d",
+   "c16e78db1fc297e17e0a2d62309a8459fc89f326",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -660993,7 +660995,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html": [
-   "b253ef85283318f9d664aff20cf277a029be9ca0",
+   "86212da23f36ee48c3ccf58155312037b07787c2",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html.headers": [
@@ -661001,7 +661003,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "2d20c7c6dd1173ad3ec978098cd013f47727e0d2",
+   "b90134b21ace83103fc194e902bc2e642c39f18c",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -661009,7 +661011,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "67169cf167cf5d3b803b3edd68a3e0d8b3a947bc",
+   "4b0dcf7c29371f9775b135819ca16105d27ac25b",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -661017,7 +661019,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html": [
-   "d21c6bda10def1bb5f85171f836d01a97f182816",
+   "8f70ddb5f5896fff18a61f6ead990b070858c7fb",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html.headers": [
@@ -661025,7 +661027,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "3859dcedf3c689c3690cffc0a3ff22341cb0be93",
+   "70e6d49f088581543409add8d335b3437e2a1dfe",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -661033,7 +661035,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "77f71fb392470b38be680a0d7d3dbc982bb95e23",
+   "2b5ad603b3ca7ca64ae18ec9954bed3add6814c8",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -661041,7 +661043,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html": [
-   "024d43ea15a2159060ad5f339bde06927b4ccace",
+   "05110163091ea5f17e00322fb3f487820d059ead",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html.headers": [
@@ -661049,7 +661051,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "fa35c1f3e97b201b037660f8ac3bba5e8f3efbf5",
+   "791dcb00a422ed4dcd306237223c921c2656b57b",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -661057,7 +661059,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html": [
-   "291f4928bad916933a32c2e50f1cfd649c70d52d",
+   "5c9f234f570717640fe19f9b9412a18e1b5f15e3",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -661065,7 +661067,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html": [
-   "f4006d10ac47f7f3d026326026352f5da09fb495",
+   "add6afd2523994bdc9bb4a258eaed866963115e3",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html.headers": [
@@ -661073,7 +661075,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "61669344ddd77739934d94de3d0cd4afdac7b2c2",
+   "98e6da8e6bb97ad78b91860ff46967a68ec424e1",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -661081,7 +661083,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html": [
-   "4daa0771923abcdb3fbdd75ac700c06aefde51eb",
+   "9d29a062d9864d60a44999c0cc151277206cb97a",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html.headers": [
@@ -661089,7 +661091,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "369e98e0f073b9eb7a15a739d6be3825df712cc0",
+   "e00321d72c9ccb926e994351939b63e402126476",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -661097,7 +661099,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html": [
-   "bac83829eb5306f3b6acae6e6b6766cded85e401",
+   "f525e4b737b7f761fd3dbbe3dbcd4db90b9cd806",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -661105,7 +661107,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html": [
-   "b6fe7805564b889759d3463154b7b60f98bad887",
+   "dc152b1c1c3c010eb179ff5dfd482801f7c3473c",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html.headers": [
@@ -661113,7 +661115,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html": [
-   "1ae15983f6cded0f6ea669d1451b0f2982503537",
+   "a775758ece488af8dfc23b7ab10d3c0866ae3573",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -661121,7 +661123,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html": [
-   "14159b0d5b9722459985d9786b5c92cb0a1b7c56",
+   "92a2d44535a8a9e955bd92b465ff6c18ffd00011",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html.headers": [
@@ -661129,7 +661131,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html": [
-   "3ca50f3d66f99b719780ea5efe19ae067b5db119",
+   "8f18dd1eca212a353e0e852b716b65a446f7304d",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -661137,7 +661139,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html": [
-   "5bddea2b1cd64790ce87c06548cb2302b89ca9f8",
+   "5f68ddb6d6a9727183dd4f8e864e52aeb08d85cb",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html.headers": [
@@ -661145,7 +661147,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "9798ee5b045990873f27cb07e43eea166e66e07d",
+   "0f397527f7f733ded461aac9a5efbec565d9c8a1",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -661153,7 +661155,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html": [
-   "79e75063576a06b42944d30e579f12dd07010fb9",
+   "272b00eca2652d1395e8f2369e64f5cf9d97fada",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html.headers": [
@@ -661161,7 +661163,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html": [
-   "ee78d6ef1e935467a6a084f439274dec79567e7b",
+   "d926e88b7cbe25127c0a71d18037635c66c1f573",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html.headers": [
@@ -661169,7 +661171,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html": [
-   "0019b7d1f3364015539c584377d75fc961105041",
+   "35523543b1d572a25d0bfd2afaa1d46c8228e859",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html.headers": [
@@ -661177,7 +661179,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "f4020bdff8a58c739526b9601a51d3a6adc971e6",
+   "cba63f68e23cfd282d1970eee06200f1ce2dd70a",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -661185,7 +661187,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
-   "48dcc5d522e87086f229d39b73210e29e9d268b8",
+   "f44abaac86d6edc135c842e7b1da11dd2c5285d0",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html.headers": [
@@ -661193,7 +661195,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html": [
-   "6cc4669d98825c22ab1ae4ebc2f83611c3bf8b87",
+   "7666ac3fdcc4e728ee7aec2bb546bf23377fd2fb",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html.headers": [
@@ -661201,7 +661203,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "b1bacfe9bbad91ab236d2d0d5bce7e6003c49cbd",
+   "098ff416ee53d90dc84a794a864c6d5004daaa55",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -661209,7 +661211,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
-   "08156b668c4cd77941068946bef80083e2c69fca",
+   "ac60e28d9f272af97899a4e85c40e6810e640653",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html.headers": [
@@ -661217,7 +661219,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html": [
-   "ae1f44978c7b6d933da161515fc8edaa0824771a",
+   "c7c01131967d17e422d96c441b5923f4bca9cb8f",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html.headers": [
@@ -661225,7 +661227,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "7b0f9d4b3b7d64c16be5bc4734896782e845237f",
+   "cd1bae5c06628cdb5b28c30237c39257407760c8",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -661233,7 +661235,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
-   "633eb15d97a9594632f782a0fa7722bf34bf6cba",
+   "fd4d713c8a7a98f7c66d899192f43bfa54fdac97",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html.headers": [
@@ -661241,7 +661243,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html": [
-   "b7dd2d260b232c707390d2b47dfb16813615df2e",
+   "7d2da9aebe1138f057d51b8faf7b232d9404927a",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html.headers": [
@@ -661249,7 +661251,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "d968e31f46203b4105784b40690961365662d3d6",
+   "60a11860cca1c059e3f67d134112cfc351c1f98f",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -661257,7 +661259,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html": [
-   "cde3c4dcb62cb95d327c2203968ef4e5b5cc174f",
+   "9b24a9b8227402c5561d991ca511c43f7d1ddfbc",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html.headers": [
@@ -661265,7 +661267,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html": [
-   "69e0ac3f3922c48c41c57b7300865e08a7fdb6e7",
+   "351d30bd251e7633b99aceed9e393c54fd9c4267",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html.headers": [
@@ -661273,7 +661275,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "f9f5cbfc2e0ecf380f62f04c4f9bf2ffb6e10534",
+   "c665e5b43f5769821764ceac38632722a3c0666f",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -661281,447 +661283,447 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html": [
-   "6a1e8da86f081b700f2e6192b0852450d972108f",
+   "05b86531109bb262fc3bdfd740b236763494ea63",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html": [
-   "cae0548b2819da6e018a754694846b8a694132df",
+   "97c82f66ef0460f9e1896911ce480b2265aca547",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html": [
-   "dfbdf4e37415438bd9a5857f396603e0a831646a",
+   "9537a48957f80738b504084345794d4808384b24",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html": [
-   "33a64908d8fe9e5fad315270bf0fde24f478f0a9",
+   "368b0ee16190000d8ee84854e92ff62db1667f44",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
-   "99d89c892d941d3611251439e3131b9c7e5b088e",
+   "4211efaba0b91bb932aeb894d2e1fddff68eff65",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html": [
-   "efc15af9bbc1ddd89b1255d9ff662833836e785a",
+   "d60f065db5043c29a468e9a16a1efe325d34de09",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
-   "6457b6d07b63cfcd7e54b0ef26fdf6c999d2e1f0",
+   "662e24872c2c8ac00dbe31e16887dfde03abeffd",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html": [
-   "b4895ecb1cac95692a7f4620d3487cfef04a826b",
+   "38948e13c4c9e5553b205e2468898b00f86f8e7f",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html": [
-   "8253f1e26e2889294fd760913b06f09f03d63c2e",
+   "907cc36092e15254082683c11ebb2a3590092fd9",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html": [
-   "8319c47992e831ff6a95a0e632fb2ae19ab9f50a",
+   "c75f25713b15dc4507e4b33be91ae507741bee76",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html": [
-   "c96142058fc425dc01cfff41b294373906cd2c67",
+   "f39fb3987d118519257769d48313012a9dd363aa",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html": [
-   "fc66046378542d569685a92139617ad97ac262ea",
+   "7e68742208746868ce9a75c871e1660cdc3385f0",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html": [
-   "a821ec58add23b552bb430e997e1fa6ec56860ce",
+   "17bd96e9ef90e7551a8002ea22e84aaab27ba060",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html": [
-   "f86d0e825ca15eee322704a1e296617fe76ffb95",
+   "a9a7577a85d6e4876b510bcf03f82a257ef370fb",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html": [
-   "f4826c63ac5b4c5843a4c267d2adcea676d43c6e",
+   "11a875323c742f3b8dd244667b997aef24a9bf0d",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html": [
-   "d83650ee3661b585e9b4bea623aa100da96daf35",
+   "a0ed420f942883961ee8d8a7da0345539ac7fb41",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
-   "d2784edeecf7083db7a232da7d16951cca57f796",
+   "f1bf5cd08007fda1a0577a2518b8bb8f51e9a5ad",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html": [
-   "48676a9744def4910f099c2d92e3cecee01bdc0e",
+   "bbd7756d552590d4dd7692c3c5a5729babb9a7dc",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html": [
-   "2812882a2ada8fdccd8f967f87cde5ec6adbe90d",
+   "293db9a254e63bf89e0061acf1bb7921c716d988",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html": [
-   "cc13e377b14a2d0f2e3dede7ac13bcb0dd6af2bf",
+   "33680a3950850e6215eee30234b561ffe6ff067e",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
-   "bbb011122af6e33d9b76e62d77b6510b3c9e301c",
+   "9374b0c9976d795809d684945017e0fe7696dd6c",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html": [
-   "6d3ec1b96339fa23baf510d56290ba614b7d6c24",
+   "2b6af670a40ee7923e520613ed445d5a75a8e4c3",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
-   "76c95cdea76713dd9552d3ad5ec30da37d732f73",
+   "af557c3e0970423927d6d49dd39b8266e701c4a0",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html": [
-   "114d4dc8656477d7a8041bcce41a148111ccb596",
+   "e5013b496c53956be123dd07f856cde5f68faf0c",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html": [
-   "0b7378bd620b3a2965044c610b3f6c8a58a3c694",
+   "f8f883c5a557175f04645ea4780a6c5813d0ac78",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html": [
-   "d5e863d2ea5f193408e9f18136a22ac9f286f32e",
+   "071c2023856d7d3c88de23eab39ca584f2243741",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html": [
-   "94f0f0b675e99d245a476d2acb1207d5a71e7cf1",
+   "4f717db0327ead93ec75f1b60d8a058382e98936",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html": [
-   "4a1ba7ae95de74545742535a49c598ccf7ed5c86",
+   "7fb3baf96cc556461f729e3c1b69c05b7880b9bf",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html": [
-   "7009e93f4b93ec87cb6b6a6506b291859e5cae80",
+   "a5d2f72ea379bbb9f965976f255f5aaff8d91c0d",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html": [
-   "219ae6d84980a2384474503a6257e7eb6872214d",
+   "f3aa717b93af933a3d3debe550595235b8f62b42",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html": [
-   "df5a52f9a8599c1ddfe4abdb9c50e969eda9ee0e",
+   "8e682a3f3d30fe594cfa88c5e66b49c02fe8e1e7",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html": [
-   "7436b3978965ed25c1c0d52f60b0811aa2518622",
+   "fa83b85d0747d71fab7a2c0146af9cb2638b6014",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
-   "ef7b77d48eb764888266c995f6502bfb554a14db",
+   "f3686ad81e8a88ad37af937bc1bbea78f08b0b56",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html": [
-   "ebaa47c7220dd4fe1ea73a6f762ae2f454e47d8b",
+   "7e81614e044ddcbe451e8324b512b3f18d9a65da",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html": [
-   "6cb598b3818983bf4be63a8acb39202bbe14e8d9",
+   "331bbdc50e38da16293918d763d4e778cbe8e55a",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "f7b661028921c251068fc058fad206ff76e167a1",
+   "dac39cccddd45380bd23bc30c10b9bf02b00ea23",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "cc2175edbb9a40086c54a8d0ed083169ec83d986",
+   "d18ea4abd82c3e2a90ef72bb5a22959701f70292",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html": [
-   "b8cecaeed1476ffe8802adc9fa03821fc8c70196",
+   "09d5070910f7fc17d50dec9262fa1d40e59a4f3b",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "ba8b28780decbe0cc5b3d4f5e4d3988866fb87db",
+   "695925490df59ec1d46fb8c4a9288fe47bdb9e07",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "9aa2e5128fc67d277317b61f9e878d54af0098cf",
+   "0da5165131edcf3922840631a76cf0675bf0fc86",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html": [
-   "9d997bd1ae90504db1b983a926d78876820a471f",
+   "0549934ffda96b5c6c66d3af3774f90c3b082841",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "0245434f37cc429db0c28948169f4af353cfb2e7",
+   "da3532e1f2ec1d18de46b851e8ff3068d4a86fdd",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html": [
-   "12b857b64dcfd55e208c7082b19af53338599105",
+   "2a4336594a204c8b4dc6fef75a20b4ba18dc3953",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html": [
-   "056ff4efbf29acf8372713dce4ed5f7fc018da7a",
+   "2ef56b06f5668708a7dc60f8036870f3bddb8603",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "969d7e8dd4c9b634b5233859e1a11d93fb33239b",
+   "2daf158239df9ba8a3b5467ebb347af670c8567d",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html": [
-   "091ce5d0eb1c3721b733c72245cd1a693876cdff",
+   "13d8b9b5c4a9bde68e2c6239c0075137e6141f9c",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "9be9f24e6ee59335216c47796fa5c45e33b2035a",
+   "ac38dd8430bbe3764e837498023de929c1db8ba1",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html": [
-   "8a7bdc29a40e52dae754495179da2ac6556f7dac",
+   "31b0ed5f974bd5b9612885ecbf7e0beed8a2ec3d",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html": [
-   "4618f8eb3e52289dc1d5c15a43c2559e2ca667c9",
+   "68e7b3b795416a3c6e489b60a84199364bdf95ca",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html": [
-   "3bd6428d32721941e361e3fbc00e11e67a500fcc",
+   "7ba521e0a07e8ae3ee7e86d9fccf0458bd845299",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html": [
-   "497b8f617482272bb1f8ef025392c4b2bc784260",
+   "23de8a050429922d797814864497c2ebdee5cfbe",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html": [
-   "225c18eb7a0f6517bab203ebd2b9c7712f209043",
+   "400db8eb15a5915b9d459d0d7a812d4892fcc6bc",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html": [
-   "eb3e612fd3d9854efdd85683b9de8f689202e794",
+   "fd20ee80fc36bd6256730dbb80f1f8c09ed02f28",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "ef09fe30ce3da89607db242df4e06990b1ab26f2",
+   "2df2a64f157171a5b8e02f1202f8674529aa9ac3",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html": [
-   "2111a0cf7c5bb0529561706867d66a4819335b6e",
+   "410b0f60abf5c2752dc77331d17955f45f021f7c",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html": [
-   "f0adebf34b3c564d4badce6964258047c0c96bf4",
+   "e8a7f7a9a922bda5d958e126fd520ee62fba2fc5",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html": [
-   "4d5714f87f1b4be87e3aee22b2c326d56206ef87",
+   "c453f6b20577fe8f45dfc0f77cd1710dcaeb0c70",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "6578bd1e63116f370364f72ebfbc9db3d64f45c5",
+   "97964228c16eaa6a6abc0369dcfbc2c068961eaf",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
-   "94802477e7b3e3a18e73384e4cca72eca117757c",
+   "54fbe6c6b23fe875f996d7b5195b21962242d7d2",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html": [
-   "a4298049e507656615a75676b31a6524572462d6",
+   "bb4c5d584e80591c411139b0c323a4a6361a88c7",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "548e63ea9741e8cc94287be956bb3cb65cacc35e",
+   "fa5da93f3207288fa73ddaf92f4f994c2049e276",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
-   "32da6f1eaae40569e070e30c7ad931bd1b0cad11",
+   "1c793e5d20f0fd9033eca03b71d34d8b3292c527",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html": [
-   "c7367f7065972721dff937e3d7a1c92b1e1e826d",
+   "af71d2cb0af296ea1a52261a12dcf4b34370bf29",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "a0e33c7205f12e0e3f6cefa85e4bbec50fa41cf1",
+   "7b048dfdd0c572b2eb293e8ad19d8d6708dfda02",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
-   "c80a3c7e52f608695d03587f8b1f9c8d3f3ed0b8",
+   "de54508cc61416b313ba82a8daae7eab80cbdef4",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html": [
-   "e7e65e19ec66aa167cd0cfd6d8ea8ec6f5cd366f",
+   "2cb2c9cafa0542c3f1e449d4b9a6a6e2ad021f25",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "42ecdbc0fd8be472b52e9c0f72350b8cd5e99aa1",
+   "beef748465d4d05a342943b0b98f1704b06ccee0",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html": [
-   "c6dcc471c47de7379cde919a60beac5acd14325a",
+   "7ff81f1acad8cd5fbd706c38616b37833c387ab9",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html": [
-   "53505abe07c2dc804067e14f9d020e6158efda5f",
+   "bbacb9889fa4f592e72e2ad3d7cbcb4587a1ec4d",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "76b1b2df5fa373a09483837f4e3b9257630d483d",
+   "75cafd9d0134c8e940f5ebe323bea08f794f5d1a",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "290d81d821a60cbef0a407bda075d70cdd8ca43f",
+   "aa620be407211c1b4131a88456fc2b18478779a3",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "403b08e5dc7f87e7ed507f7f2e06460563890950",
+   "a75718db06c94b057e7c0cc3b3b963477b4548f5",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "25e9e2f45fb7dc0062c898216bc7fc13d3026cab",
+   "685c62057bed9b087826e522c055c5a27713dde9",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "0ae83292f8a2dd8afcbdea225a66fa941c74b246",
+   "7914e4c579394e293b6131d46099ae5ca2b959df",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "7358e1c7019456b36764bd6726f2608e4a741835",
+   "a24dbda650f64ae2ecad869b44e375f9243f0627",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "77b87b8cb976a475ef146359fa28cf3bb7eb138d",
+   "7ec3eda9fed5c6015e9920c436dbc2da4eecab16",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "e8ba9a759403cc8948124d21cb96476da4483abd",
+   "214480ca0ea75c2ec61936d7ad3ae8e9f99398b4",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "9be1730a90ea1039f2e52b25a779c7bb76b340da",
+   "1a4d14979f2f70430afecbc2ac3c47cacfc3a014",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "a7d72f50618482dbed6295544912c1283b3c4f91",
+   "d120b9c15545bfb6a145c6ceecc415b39729fe84",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "9bfb0810d3d056a69a5dfacf403029aeec1eb84a",
+   "e634d528dcd1123c60696e8e74c12806d376bae6",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "6d528c04d01379fcbaccefdf5c680a3220f927dc",
+   "41d7e859d41c1968e72d62beeddf37eb98d03761",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "5622a50bf201d873350f996d2cc0b731efd5a83e",
+   "48189b1adabc698a79f9b31aaa35f3016a72a620",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "dfdf69fbcdc6fc5debabc5afe01abad28a0f1264",
+   "8f7a234ad56b869d49e81d67cad42de5599cf40f",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "f5542f97e1cca419f43b36f2aecb4f2e426b53a3",
+   "8a7a4cd9f655056cebdeb472c4f4a98548d8400b",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "8cec185e133a1c502175dbc3c63f21bea3e852e4",
+   "a868394177461a4cbc649ba4e886c6c28a0b10c6",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "9cb253f3569f7f4fbe7ed2d6f5a459ce2324f568",
+   "f4275d6d7a87b3bc8ba23c9111c4022dcc0fe016",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "2ce74e688b9705c807514f88678098da6b9d437b",
+   "248ffa35a82141102ea6afc556ef14682b434842",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "0a24543d610da923037827f3ef7f55a5d199bbe2",
+   "16c44750747b47576a3d4c453a698600603e6574",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "463b67ec4ae74e221ec3ed16349365d970321252",
+   "8bf0a00458ebed3854507fa6dbc87b0e9be6d485",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "10ef951d91ee911775cabfcf1f9195a923769f08",
+   "611336e515fc35ccffa4327382fbe806796f44d9",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "899f078c943c0998e9532c39c0c12f428f81aff5",
+   "bdf2c0192a842a73aad189136cecbe0ab0761db2",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "ce0b1252eae951adc47eda26b357a0834780a2d9",
+   "e5f01e6693246cebc78dbcff86918f3df0883e3f",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "39304901c558f5777981db4d810fa704758f3931",
+   "e471f0a9e754196c658ab572b204ffd8ee272826",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "98710624904217c80f045c003d85c7872b789bc3",
+   "8f7e7201ff88e79f389d62cd15f68e00a4af731a",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "33d76d384f2e3db961855708c8aff0c9f9bebd06",
+   "c52859bbb7a091d677e0b811202ca833dd934e77",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "56a0eabe7dfa215f45e0b7ed54308420b8cf7f94",
+   "30075aff0b6c654f92c97b39359ee4685f922723",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "2befe6ff3818b3b10ad049dc5ce88ffd5f1e34b5",
+   "3f84d37ade115aa1e0166509c87926268b74df13",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "84333fbb7ab895f4685a7bb4ec0fec7b3700fefa",
+   "7a233bfc2fa249ec1ea580053f1b4afbdde36cca",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "15cd9b2b89abcdee6eee78fb2da0de11a17c4f94",
+   "3e523d9f3cdf94b0772eb34064264ac945e349f9",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "10984fde1aa07da06e23f829b075e9e8c3150cde",
+   "532f0c5c33c581d0f651d0350067d3a0ee6b9a74",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "e71d09acc8f13579922338e6a41bf55a72d7fe3f",
+   "f9c2b476b4f73f2111e7e17ea1c875d04289c283",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "c9cb06842c57876979f867a3c9a94b83684aab77",
+   "7ff76ce0747484d222d2e711d4bf8ce8f69e1f83",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "c6f8e1490fb9b79f246f10c0e0db95d7cb5f82b7",
+   "dc86ae02073f048f8430055c6365fd3f7a22f65f",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "dd44b6679a866df22458509b29a47cf65ad79e0c",
+   "3ed7638a2fea350a22b3c3423fef3b9ced280871",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "2ae35e05039455082b59e06e7fe883e09e9c1adb",
+   "ea62578df2b13c9f494d308d5e3df3af717a9e34",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "2b7cc6d59540a5e236fedd45822f95cae7c16053",
+   "50d5a6cb205ac269ab35d3b56fc3afb87f38b01d",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "a6bbc66d32caab811cdcf998c14d565284fbe381",
+   "ca194603e1958b9f8ce68b5930a3ec1f9c9b496f",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "554665cd3e0ce07d25b11c6409a4e5ed97f725d5",
+   "3617e7dca8c9b46780ad8308ee812afe01c5de1f",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "6237b64bd34a41a0b0eab8dfc596ee9e35bc00cb",
+   "d21d561aedf8ea03c532fd31e17b4b45b6e123de",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "6eae7c560197e86363877d037e2cbb52b029cf06",
+   "2b9cf95062565343969d433196b5d11862c3226a",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "5592aa5d0743f2c540d056bc3efc5976beede52a",
+   "fffd1490fee6c8d77cd77b345993de1128fab157",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html.headers": [
@@ -661729,7 +661731,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
-   "758ab57672046d01d28b3c4f29aafced29fe7661",
+   "ab66756f26db8fbee5618f2b68fb06c461202226",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers": [
@@ -661737,7 +661739,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html": [
-   "35a5049a54b43e63d9bf56c16237b5ac3f1b37f7",
+   "8ee2450b5c6ee31aadfd824f48323e385893b21d",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html.headers": [
@@ -661745,7 +661747,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
-   "851b077e6a202b688ae91729189f05dacfc94fb6",
+   "6b84a807ddab1ac245da2aaff0b24aa4f3bba254",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers": [
@@ -661753,7 +661755,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "cd93dd64a82f2e7f90917f799a5cfaa962ef26c9",
+   "3f368591eebe7d5e9ed296bd7f2e5897092478cd",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -661761,7 +661763,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "3cdd172581e479db6537598d3181e3525e69295e",
+   "ad08efb479ebe59582b30bd32a5c55e98c9aa539",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers": [
@@ -661769,7 +661771,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "34be306a1b08c4bef27c19440861f6746e024192",
+   "e7a40a8f5b58b8b93c0c4d28883cb4de6c4e233d",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -661777,7 +661779,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "33fe33fb1e9d2f1a85c639d7cd40db2aeb8c161e",
+   "f3a1ceb24851d685fbf2deb948adfffc1c55742e",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -661785,7 +661787,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "eecbe272b070e03eae1d4f9b8d3f50d011354597",
+   "f742fedda5ca0d233bb000ef175a45f0a99ffe39",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html.headers": [
@@ -661793,7 +661795,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "90f8d6aa6a128e2f70e93627bcc7c8e905b0b41f",
+   "fc5ba70b0f5229ca3a6326b08458848c5691f74c",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -661801,7 +661803,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "8f88eaf53e0fefdbc0c21a8f6f9b69a6cf8c1a42",
+   "bee7e7c7dfabcb61df172478f38bde566aac44e9",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -661809,7 +661811,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "3df62ffabb05f5c4a222c659aa4eef8bda8e0b26",
+   "7bbb4f14eda8bc9fbeac14296a8e6011f3aa4023",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html.headers": [
@@ -661817,7 +661819,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "f9961c352bf408e12627f060b2975529c78d7b7e",
+   "b318b3d1b52933707329155cb0fbff9a22e1544e",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -661825,7 +661827,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
-   "4c124d2982c63a95f9aef947558f45a271550220",
+   "a245060678aec5d3d105c6934d5b2d9ff950d759",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers": [
@@ -661833,7 +661835,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html": [
-   "29b6635f96947cb6d46a7a683907e3b4bb5195e2",
+   "618f72716bf58d2b8d0b6f8e9e5362013f6c0d98",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html.headers": [
@@ -661841,7 +661843,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
-   "501315b2bd40fc6b82eb2b47467aa442cb97ecfd",
+   "9bccee1d35bfb02e8368c37a109b7221c86af5dd",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers": [
@@ -661849,7 +661851,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "b8b2f5ad6377050838a7bfe809a5ab95a3bcc89a",
+   "d134273d38f729f04ff4eac09182bdc75fe5f8ec",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html.headers": [
@@ -661857,7 +661859,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
-   "ddae157a6a23eaae7498749bf37f24f4e69a54b9",
+   "f33f2a41642ecaa660359bcb8c532f3cbc06882a",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers": [
@@ -661865,7 +661867,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html": [
-   "b484454134d5d6b5eb613ddc37f34d9c40110245",
+   "ec0f304dbd4ca6cefc7cfe0f62e554a4b297e0bd",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html.headers": [
@@ -661873,7 +661875,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
-   "2219a9204d1c581f82419e47b9a5a40f692e0446",
+   "1283487e5f29e5425e67436894b3853852f5abac",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers": [
@@ -661881,7 +661883,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "22559b1097afde25d04c1cde49f97959b77fd2a2",
+   "10f7d424f2a934f1a0c264c4f87ea7e717b769ff",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -661889,7 +661891,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "ddfbd4e197e8b4fd1f5f32bc205fdf9deed02ce9",
+   "4b988f93a4fd97b5444347146fe01f0f294d4e52",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers": [
@@ -661897,7 +661899,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "23df7f0ad7c29d366a7a592b82d0c7248d7bd249",
+   "3989f871abdb9397e36c21053208295a0ce26bbb",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -661905,7 +661907,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "767c138725f0d8b747f05e23d74182f93e24d237",
+   "393b5c8f2c4130509790ec42874a0b537cb007ca",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -661913,7 +661915,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "414cae5d65eed5d0d38b42fc82d59738a7445ed3",
+   "da1a319f11db79fb43390c5adf78d375dbce30a1",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html.headers": [
@@ -661921,7 +661923,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "081b8b55fcd7b8e60641c20ab72d1c71586f03bd",
+   "51e7b9f026ec24a634890584497d9147edbe7165",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -661929,7 +661931,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "fd3a69a85ba5132cc2872b46c4a29ce1fc30552d",
+   "c3ef83c913aebf8d4b49a0f6a653a2b4559f560f",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -661937,7 +661939,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "65a3a532696f9408c45e34a45005799055a584a1",
+   "c3e754769d78828b5241a140b07df7ecaf427949",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html.headers": [
@@ -661945,7 +661947,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "6fb1b31b1ffa14bbcb2133d2385a24861ce632e9",
+   "36d54be09f7ac1c461091afe2b6e099dcb362744",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -661953,7 +661955,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
-   "d8ff89441f7318d73ff0434af0a2967ea1313891",
+   "8f5729a5ff80c890e595a2e3a9d251ccb2199c16",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers": [
@@ -661961,7 +661963,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html": [
-   "58fbc4829c8c6948db8de16b96a4cd8de9027093",
+   "ad5192f22beefc5559136bf247d93ca150566475",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html.headers": [
@@ -661969,7 +661971,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
-   "229787117c6e8a1dbb754073f27260d422d346d2",
+   "bff291d441e1d31facd93c0e8d82d17583f59cf2",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers": [
@@ -661977,7 +661979,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "7b79cdeb43229eec5c2b02275629de5d4ab8b652",
+   "38d2b85996e913624ecfb8c4a11466e538004f90",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html.headers": [
@@ -661985,7 +661987,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
-   "2a421f84652350375cdb4f98e75af3bfa89421c5",
+   "4c6c66b676cc6d36b55ac2451999464fa007079b",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers": [
@@ -661993,7 +661995,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html": [
-   "df23d02dd855e38c27cb4c672faf104322872def",
+   "cd8d5a5be9d45947de4f309fdec2ab54013b2631",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html.headers": [
@@ -662001,7 +662003,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
-   "0098e8f3e103d121391c005d8022c6294369e70a",
+   "9f3da6f3ab8b29bd9c4441490a6358c4149fff0e",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers": [
@@ -662009,7 +662011,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "6254fb8c76173fe7481ee9fa2a42ddaaa02081c3",
+   "16a0ea6f259c192beea3e6c88b2b7bb117f51ad7",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -662017,7 +662019,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "8454f0665a8460eb74be113cf6148aefc47fe59e",
+   "ad1fb82a0925186fb6ad3e469d9b94d06b09120e",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers": [
@@ -662025,7 +662027,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "381737defbd700fa1911092569a61796cf82fbea",
+   "9f2b156b000b2df91ac834b11c3e22434a3848d7",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -662033,7 +662035,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "7b600cbbd4c9dabf51771ef8d2ea60fc3f213b60",
+   "fede3d587f1f66917aac7590f4bef128aa786b36",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -662041,7 +662043,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "f6631d88424c25357c00d3d0c719c2c6698d20e4",
+   "433f7e593ce353bb8e7c03f0b49f78bfece5e569",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html.headers": [
@@ -662049,7 +662051,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "4f087234601f248b8ccb0a762835b0a8e1b7619b",
+   "daed62fc5e4dec1b2891a0552464221ca3ceb909",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -662057,7 +662059,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html": [
-   "db8e7be2376b0119fb9f4ce37a72df943bf51507",
+   "615d560eeb194648c43de61968db15deea61e286",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html.headers": [
@@ -662065,7 +662067,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html": [
-   "5a335d0863cafbfd15e95b6b1fcb7cde9b14663a",
+   "dac70645d79bba67d6a5f013384d0ba3c58b5a64",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html.headers": [
@@ -662073,7 +662075,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "04027e95f075c85d94be9a973c85081fc9b70f71",
+   "dac34ad4b55932850178a4407d579ded1b0794b6",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -662081,7 +662083,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "37037229b118a04e174674702d2396b399e4006f",
+   "c649d8dd535f2ed01995c36f9dd1eb2255c27c43",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html.headers": [
@@ -662089,7 +662091,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "13473d515afdda75ced99b2242f5caebb6e0a221",
+   "1c621fddc142b840d38ff8060b6cf9ad6492d338",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -662097,7 +662099,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html": [
-   "82ee6907051a78e79b72118508deb88820372a14",
+   "d8b420b1cffd0d5b57aadc1198eb44b7c7550390",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html.headers": [
@@ -662105,7 +662107,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html": [
-   "333f687308a71aa32ec84c0fe1ad081b732c3f24",
+   "4fcae6272f1845264fd5f9cefc45b6ed7429f2e6",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html.headers": [
@@ -662113,7 +662115,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html": [
-   "be0f44caff62cb22853b8a008be45709b5d19560",
+   "144995f92ee2daa7cc63f832e96daca30ee86772",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html.headers": [
@@ -662121,7 +662123,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html": [
-   "7442817360655556433079b7f81cce7403d82f62",
+   "bd0400245b5e18d1c83d39044097f85df701e938",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html.headers": [
@@ -662129,7 +662131,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
-   "619ed34a3315f6c1e28f4b150b086bafb040bb83",
+   "93c9e35cb174164d39dfc89563b79f160da4a063",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers": [
@@ -662137,7 +662139,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html": [
-   "015a044daf6146bfda2ec0761c3809bcb66c9f2c",
+   "edf049b19687c495f39c22efe142adc6d40cd7ae",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html.headers": [
@@ -662145,7 +662147,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
-   "2b3c2527b36f098556f8aa74e0cb9be90797435b",
+   "92eb517ea4cada62d5e78c0cc9ffb84e39800bc9",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers": [
@@ -662153,7 +662155,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "f3110e130184a6c74883c5e079c794e64db88a10",
+   "ae73fbcb869ec0e5426197ef176f66a579d76848",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html.headers": [
@@ -662161,7 +662163,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
-   "02d91a903e9cbcffb96227d31541bbaf37b0782c",
+   "37b908384578f3bbb150313b65b69eead1853790",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers": [
@@ -662169,7 +662171,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html": [
-   "064eea5a3a14534c4cdb071bdf0c3f2f3c872037",
+   "9f077babd8382e69514a62ea7a2787f5d8221550",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html.headers": [
@@ -662177,7 +662179,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
-   "d92098a3114e0c3b7fe9cd4ad24399e840761ecb",
+   "57d7d3a04c0629a7d54c7e8eaace6c2788c6a12e",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers": [
@@ -662185,7 +662187,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "a8f6d4c2b007570c75cd22e4b804ff5c2c1f55ec",
+   "e857f4c73716bb533d5c8116c8a7a1b9c36d713d",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -662193,7 +662195,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "22b20d3b146de20f638e5111d4fed279b14c9c31",
+   "1b49b8f82739fd12f3891520e6319deb54680868",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers": [
@@ -662201,7 +662203,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "e4c0e8e69935abf728ec6fd1db6cb1b67b3d57ec",
+   "44ce1077bd62b297254c74880f3df3e7cd474e95",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -662209,7 +662211,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "30a7422fe64079fda379df935984541f1c35a45e",
+   "84bd7f15785243a66ded999a4049033bcd76aeba",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -662217,7 +662219,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "99c436d7fc887118ac1d1d908d50700d5fc3be55",
+   "af062631476321fb6a8fb217c6004fef20857ce6",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html.headers": [
@@ -662225,7 +662227,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "a94ce6d57bcf5355bfd42f2f06c1a1ea849e74f3",
+   "c05be86fa2809b2ebe9dc415d89dec6d39cdda3e",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -662233,7 +662235,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "9f262c0829811a679269877b0fc31aedd2a07cca",
+   "ea519ad8b0f12ca73a1b04e6aa3d79f7c51ef6e6",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -662241,7 +662243,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "e4d50953a6872829736622d5b84fe671040506c7",
+   "34b777898723a847e1f54834a5a49af17752fe82",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html.headers": [
@@ -662249,7 +662251,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "3a3e505e007f76c5c0709c9c49cb1f9ffddfc332",
+   "770a09f7085a35959cca31d837d381c735e302f8",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -662257,7 +662259,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
-   "8cf8a9db06f230768646cd8e1f94c038f96cf337",
+   "734bc6f95c3c38388983c495831b72d8897d51ee",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers": [
@@ -662265,7 +662267,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html": [
-   "f0e9bcfe4ed216ea60b9fbed3b436986d1e61468",
+   "d050b563c4b09ae73dddd51e68756ff4936a0d79",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html.headers": [
@@ -662273,7 +662275,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
-   "9bb9159faae24724e1857a6e676ddd1b12378891",
+   "dab9d524b50b9b95a6eef2eb99b5a23bf6bbbeb2",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers": [
@@ -662281,419 +662283,419 @@
    "support"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "0d756694501985d41c2945d7327aca6396a8dbba",
+   "84dea491ddebab418bcc3b193bf4f6f5fbf1ad70",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
-   "66cad9817144c428905ffefb2ccb80cf5569302b",
+   "7b1cbb26b035605b7cfbed7a838f95afaf514d8d",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html": [
-   "373a9a1fb9f25a7efb0cb51d7d59ad098a901e99",
+   "99c2a35a24a2ff2ee45910a01fefa25bda695b0b",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
-   "0661bda2b5558df3d661281a2de8dac3128d5ebd",
+   "74d96730f03eaa4dc2b50f0586a726ddc05dd0de",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "95cfae3151e62d596046b934e9b326f539969bf9",
+   "9ce9bede537d8ed3d3b7dc0c01a549432a370ae2",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "5631be4380a884c0731db65e22445cfe4def74e2",
+   "506e55c79202249b3d39bbf3b9708a207b4bc8ff",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "c5f2de32e7158fcd5cae13bca07bbd13ff4cac34",
+   "bbab94c8bbd6e2ba11d61fe9c77278f3aebf6df9",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "e676621b20b5d17b7ab59c045b0167aa5efbc5da",
+   "ec567113e3df08c2ca5bfca949794f55088eab4e",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "d1f431ffde70858f76296a20aa5977c7937d2e88",
+   "b8e5a1e0abcbe7dead827b668049ff4de2d98611",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "10ba9c188e19c8c61b669c5247b9492fbcb220dc",
+   "c4c455d4c18b622a9fc87471263dc34698f29f39",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "78762fe53c6a7d0638af43e09d8507caed71b062",
+   "7c00437264b954f521a466145553eecba8b9e33d",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "8580bf41ea14c8be3c42f7065514c9cde85e453d",
+   "f7e611b0325154d42bfddd07408f0bb5bf39ba7d",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "740cca8ff1699e565dce6ba6e3929b9df0d0038b",
+   "e813a79bb07e4f99e79024ae58673cfea6c31dd2",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
-   "38096523b07b35da9263c8258f1c96b8d585868b",
+   "b399c06afde9f2de8b4dd278ba9ed1a92362e8a0",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html": [
-   "9d1db30f66b4c5e3dfcd827ed8aa5da22ac0245b",
+   "e9329317d5f24dfc24ec1a2a0e08cc7697d488ad",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
-   "f28bd6734a5d10af4b1ba83b0323a630f8d700a1",
+   "2139b0b14f636c6d48025316c5917257f5d462c4",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "ad1d0d06a66773c7938c6ba0492b857a7fc898b8",
+   "71695073c1d162c0ce754891638b56356f159699",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
-   "52ea79ea3de9313b7139159cc43c66e298d736d5",
+   "5e689a460087dd84506deb6e3e24173849a4298d",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html": [
-   "45bc707ab0b0caa3f1be8af6b1de25d613fce44c",
+   "397d206f62dd79917435d6876aad19ce6e6a0272",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
-   "d80387047c91ef556836538dca5628665cea07ba",
+   "0ccd881d9facd854ed8b6d323b333da1e97ca585",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "6465e10c905798e2d4a0a698179acf0324a4fbc7",
+   "e7e41b63db231d641c7d1104520f7172ae10bcce",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "413690e8da87c00fc207588507ded26455c859db",
+   "03081d0abfb4d0aa746d900c79e9f50803aa24b6",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "602ec76bdbea9f0a492e852abbc574ab2db3c37e",
+   "18ce9743bf761d16d5101ce61af952e5622c6e18",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "1a987e7f595b361ab36d1d64f2afd8c0771dbd8d",
+   "a5950befbbfc1cc0dc88dc4bdf32d83481ab745a",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "b7d1135086208d0595644a6b657a7f03d4ac56ec",
+   "f8a80aa5a060f73aee22f4a3c073fa1b1f130d0f",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "312c8d556e973922e3c07f0654cfc277af07b0b0",
+   "2e5e19e6251a3f415cf423257a13c836b958c126",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "ba9d5d08f7ecbc0699b6abb486cd4a68964abed0",
+   "c7ebf4abcf50ee18b4c19b64f6c4d6987b6f56bb",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "93a164d270f18b0b657598338b9f091bd3956413",
+   "3a9187bcf99afdfc4eb7215487a50cb5b800c052",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "9b8f447e51482c577d41a15fa7d7ff7da1544fc3",
+   "0cbaa017b59a8b39633ab30f63159b6c9247c67b",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
-   "8b1a8ea3d0423ec487696dfb8d26c3d251b4363d",
+   "3737ab6a8f72968b9d5d41773e3723527f3e0882",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html": [
-   "d40d7b41133e520e24e8e392102ba5d88749083a",
+   "4c384414f3183e94c46558801c0c26dfaa4d44c5",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
-   "65bc469879be24d35adebd129b23cc53c227572c",
+   "037b7a011e577722139470b70f0293f7ae4ec426",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "69c724f4eed283519075ec58631d2eb6ab11b2d8",
+   "0cb67fe3056c78a50db0bb3df09a89b56b94a1a2",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
-   "cba7210bdf0f53ac7e58020bbb839a246ef41707",
+   "16fd9997ceb6402336ca752b8796ce3b872e9b58",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html": [
-   "54122bd8d5fe653473a2777f208e2949a81e60d2",
+   "d38c1b6503a1195c3f12df4e2a9b76d0ffaff2a5",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
-   "a83eed311088e59765cb4d6b70b85ce44514f968",
+   "074b1865ee5fe3bf14bce63ad17bcb4ae523d396",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "493f79902c7ab5c77b582dd5ac4cd269da61dc95",
+   "9f644b23c8c33e8a10b9fa8e03143176a73288cc",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "4aaae188f74a406ebdd0d6fbe733d34e800bfd92",
+   "b9ac4730a34595eff845baad0c34d006ecc14044",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "acf0c7aa0254af3c191eb1d2f886554aa10bf172",
+   "f4342e37e643a50727e0e91899d5e7fb4b1dde21",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "99da41e734704bb09fd9611c2c44c4ede7119664",
+   "9ed44e5a4287b5ec9957b7e5586e6c5910b30fbf",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "756dfb3cd2f8fca830ab27642e816ddc1b5a1740",
+   "6dd14610457ab1dadf1d23dad91b5fce91d859e4",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "65ed223f1ec81b5f5257a37f77bab0ba640de725",
+   "821d533f6f2e0870d77b34dfc275fe26d986882d",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html": [
-   "87ebfbfa0b0ae7854dd5747c073ca39b68e50d5b",
+   "06d6ba95b185142ea2e736284a213403fec9609a",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html": [
-   "0cf72a93e9e9f89628be50a54b6920e3eeae12dd",
+   "f4357c15a394e9f0c73e56cf5ab796fa23d734bf",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "96e7d4e7bf935bc23118970f04c719a60cca465f",
+   "53a65a9c81478818aac900a75bfedefbb56ce780",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "d6c28231cd3efd984e1dad37bb75897581f62eed",
+   "73766d21c75d5f3629c8b6affd81010e71a71a9c",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "ee9ad9993775fd3d1865dceae1930c25b02ec9eb",
+   "a534338697f87825d16c0ea5d35d6f0f6c563684",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html": [
-   "09ccab6e19f29b97ddf967ad68824a55fb08565e",
+   "90f15d3fac0f23604d6f7c30e59b8c19334c043e",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html": [
-   "36e0f5d34f4698d67bcd66282fa1d30895c4be4c",
+   "4e4bd6e90a5706ec0fa531fd939cac718d1d778b",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html": [
-   "69a8c2c1d09d37559c8447f5fe7803bb3ed135b9",
+   "8e69d73f9b80387e42a7828103ae81b9f2ae003b",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html": [
-   "4d4e8ef2ddb6def791ac6e86ed936871aadb9272",
+   "400e92543337d1dbad477893273e50fcfddfc750",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
-   "e33ca1b5f933189b597e13e1aa5c8a346b3cda93",
+   "94ec3d20dfee5cd98bddf7431d331e19a559e93c",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html": [
-   "e966c29b62824514dc56498e44fc0d05f701b02c",
+   "bf854e141359ef2fd1559f4d483fdfc3919ea918",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
-   "175441c9e6690fd42117e891f160f1a7c4a0d948",
+   "45a441abd8e180c0f23d744704231afcd9e840e3",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "f323ca74bd4e09c31b9cdc61798c5c56f41939f1",
+   "ae8a1cbea7e466541ee0444c28759e7ed0acd6e5",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
-   "21828b7b73d3719c5fd56a708264064ee633eb28",
+   "487a4e01ca71c7fd70f348b33214cf67186d5038",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html": [
-   "cadd6aa50ead53f74965717a031f8993c182fef7",
+   "ed9dca4b815c382e0ba45cf0a7fa0ef8074eea73",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
-   "ac6d689b5ad20b80bc74a9deead17567bda574a0",
+   "b48fa8741d9a2585fb2ce0d1926d1a49513dce87",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "92c2e4d40a9526ed6446ad985e7c3147872ba039",
+   "b70b01384f4f0e3a8698046505a6ebc03ad088cf",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "eceedcb150a9a0f09ffec587def56e27c0943490",
+   "8bca726055ad1123ae29cf08b2ea56e66ee36ef2",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "e847df8fff2daf0ff18a5cb447d8b7c833853b4e",
+   "5145f3b87fc3767d6ff9045a93ccee2574a256b2",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "9cb83cb0c97abadd206b0cfcdf1d498242c037bb",
+   "49aecc71a73065a810d7b98a17c92f8466a1c6c0",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "700d95828b0ef98d842f7db1c383509ffca148b8",
+   "8e306510727d39962d9149991377c19a09c59074",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "73c907dea435ee6a54d6e35de802832ec05c9481",
+   "e8cbb66772280a74602b6116c6f0791fc0aeef81",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "2b7786cd384e3c228f6e8f66a3407772dbda4726",
+   "348ed773848a711a8c14d1b3d2e8bd909385cd79",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "15ff14f65cea6b383e95f4d5f302136ed92d7a66",
+   "72ff5190be39c0db434077504135c849bb6a4439",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "ba8411200fd6744902165a0469321bb09017c0aa",
+   "d790e13840b1ba59d87d15e9d35621fcebdb4c0d",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
-   "60df8dd482451c780c626c0ffd4d71b302ea13d4",
+   "1a05902082e8ba837a880ea91f753a87f9f725f3",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html": [
-   "a119d66bea158c2832fbbbdef9c284dcd3001ef7",
+   "5d798f540bae50540e230a6f6e70f7eb9e24dd7d",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
-   "47c8084c38eef763e57fcd7ea5339d43d4af05aa",
+   "a11d44f1750c31b559f8c92c8214220f48990a65",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html": [
-   "8d4c19c4863d848efdaf985b7fa6dd367214158a",
+   "27be3854a1a56e0b9d337118a3b65cb79ea422e9",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
-   "14e928ea859a45010ea9695afe247aa410828481",
+   "d781a3c846b9a1e9be012843725cf4a14719d1a3",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html": [
-   "0e549ae0d402ad38db66ce5fc30f02aa4c0bb6ed",
+   "10d6d0240db66ecbd187440db79dd1d5d06a1e3c",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
-   "ea0d402325e99ebdb9750d6e2a21dfd9de3e358d",
+   "692bceabc2dbcebfeb5af6ec53609222c4fdbd21",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html": [
-   "0acf101b8ef641982541838c898dd88eeadf0de3",
+   "560438ceb146f146e914e367bf91f59c695b908d",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html": [
-   "7026fe1d12d070a5ffb2e54e8bc0eaa96125c8ea",
+   "e2e3c145807bd7a8ad2150c41c931513a3e1cb30",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html": [
-   "e8bb9ae8580cee5caa06b716bc0d033767504561",
+   "4d1c319f03a831d98d8e5c469123e1007dddc611",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html": [
-   "0c7b71228174cabaed922cc888dedc07773e98b6",
+   "bc7ee277cb44ffda8958a6e06bc169eeebd8483a",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html": [
-   "eca111bd511d93f78fd545dc76d3b302ff22651c",
+   "7cf53822096c10807cc47e1658f8b7388efed985",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html": [
-   "f46299630e10da3a59a91f7a31a541c661457b35",
+   "ec99ff4cd648c0bbba59f5daac05e29c40b8ae6c",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
-   "59943a3ee452d8fadca88690aec0ebe5523cba00",
+   "2b47852898b76a645976b60d8e187929870fb518",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
-   "73f992b65570ad3e87dff57c63355b9f29acee90",
+   "a2b03cece1f775ac694237a9f354f08682cf99cc",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html": [
-   "7fc3541bc7f5c1450557611b07ce36c21c7c9544",
+   "1ed9506e591ff3554064adaa9e95c50d0154e566",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
-   "73ba641f908edc84bdd06bc59c225690af94ac14",
+   "10d8d55e4fab65034cc06968d839839e8ac6c3a3",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html": [
-   "172853a4fec05a7514633de37835d4cef8c240ba",
+   "e5599ca5d60e5ef1ddc653c97514e828613daf36",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html": [
-   "b2104f4cb599e4508f5c31c4b2d6748c7704dbc3",
+   "5982a1a2e5343f5331b1c9360e1e52f891435b73",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html": [
-   "c984c4363e8ab594f607b0bd361c9e99baccd5fa",
+   "d843f6e389925ca8057108af8061d815d50d825b",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html": [
-   "7b61c2621889f64c161acb705176208ee7efb0a1",
+   "22e5916a6609f4fc2326aab00c2b3b440c816890",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html": [
-   "aa3b6aa07b15a809e8caac9ed74dd4bb8efbc962",
+   "32fc200c506755e96bca2cd83f39a25e9f6465ec",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html": [
-   "b993d95afa4042d177f06f9c168465c8f8639aa4",
+   "1b402276e3ceff099db8561aea325fdd69e2277a",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
-   "a384aa04e3be39df35c5cf76800b9b9088e7d8a0",
+   "16e801bc89a1df0664e37095d2aeb6c67e59f2dc",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "4cb71bcbf1956e755b6f9c43510d63aa001d22da",
+   "3877ada9427d389c578fbe89315d65c41b9a9ccc",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html": [
-   "66abd90fd5d507419a94aef2b4bc3f45f5071882",
+   "1fc0adb4d09736966d935b3e2fb7b98ed7016f94",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "7c366c1080ebc86bc0018142ff69b3aa51f5f97e",
+   "190220f0161eb307029ec84bf8d86b66c284a9e4",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "11683e44beb328eb4b2e495a0c29e15dc67f0de7",
+   "fa4064bb6c4f6d1ef9e159b07434196638314563",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html": [
-   "617093728176c8b4bcd7e64ec991a48d31e58624",
+   "ce1a841dae757d2ce85f248ef7ffda2ee113c0fb",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "594c2984df619825d67ed32b3600bcd1c11c2a29",
+   "c779d1494644117691bfbaf44c48cf1d45e05fa5",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "0a4d82c7eed3a4cc8b87a40aa40ad512826acd89",
+   "949c1235c23840f002cc4fff7b3c22f460fba3be",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html": [
-   "7eee32a0406dd87c11e77afc86d898ce34e920c2",
+   "d24966f203f5403d04cb92317725f7ead8ab86df",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "f92bf349cff2ea52362e037617a76f5f51dbddf7",
+   "5a995aa042ca74f113cb0139b9a8905ece352492",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "f17556c54bdef34437c2c36ee0387d44bf941912",
+   "08319d5faeeaa7a2964960f4c91250460f0b11f6",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "fa91f2cbb38b69093e92ad732bc6ad3b0af6b01c",
+   "31692cca4601a8c23f3a7fc31c15d4eb7f4c86ed",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "ddd0fd439071ffcbb80845e10c55c7c40ce7c916",
+   "dd06b82cb0e17f5aa703874a5183de59bc3c8f94",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html": [
-   "f04cea14e663a8e4d60e1fb4168d963c94fc2994",
+   "b5c99bd430a475b45e6b28802151c971669216cf",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html.headers": [
@@ -662701,7 +662703,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html": [
-   "18dba0048818eeae44b14c2990e18bdc57c7ba78",
+   "06780d9504cb98be72fc8a287de3d36dd65776e1",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html.headers": [
@@ -662709,7 +662711,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html": [
-   "9d8b2b2c4e1b258466bd82c287616a8f2f0f7a5d",
+   "5e57d9aba05e8c48b1381066ffb77619ab0d6378",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html.headers": [
@@ -662717,7 +662719,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html": [
-   "2befacac7af325d0b5da4bc92642498cba5290c1",
+   "ac2b34d45167438611e7e100fd12990ecf366cc8",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html.headers": [
@@ -662725,7 +662727,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
-   "988c99d5c60a0a2759aefccbf1913483b227928d",
+   "3db9b5d5ff68c60091710d8274722907eaa89005",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html.headers": [
@@ -662733,7 +662735,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html": [
-   "7588d84e09326df66a83e53af19e0e3eebab6fd9",
+   "81023157107cfa9f97199dc63aeecb3dc566e343",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html.headers": [
@@ -662741,7 +662743,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
-   "3e2b36979fce69977685a91758b5cee686d5c6fe",
+   "9cffc3a3e9ec2ca6c93372ee1263080cbdda4f8c",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html.headers": [
@@ -662749,7 +662751,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html": [
-   "b26c3efdc2a5b6ec62055a5fb429f6f5ea7db18b",
+   "77090c12734e1518e1d51dd02d37f2f1b963369d",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html.headers": [
@@ -662757,7 +662759,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html": [
-   "c7c348f90ba8d106e6628405c5d3b2bd6cfd05c5",
+   "e36ed4dd893aa2ce1aa65fdb6b52dac641bdea7a",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html.headers": [
@@ -662765,7 +662767,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html": [
-   "126e278b4b616ebc980d7b626440c4daca7ebd98",
+   "90de6fb92aa87d9a89f1f31751000e3229f25d82",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html.headers": [
@@ -662773,7 +662775,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html": [
-   "f22d6d87b88b70be73b0422e53ab195c04ebb3fb",
+   "a483e45c53f4fb768eb55a25dd05e56b951bda22",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html.headers": [
@@ -662781,7 +662783,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html": [
-   "90dd8881d5369d965ea65be32945767f56c60b9a",
+   "88e761fadc95cc094a8c5f53b0aa3b8d9dd3e3b4",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html.headers": [
@@ -662789,7 +662791,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html": [
-   "8dd055d71c36e6e2df43ac3a7b16dda8a0fae937",
+   "ab9b34004e60624c6d04c4aaac839deb9defb9bb",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html.headers": [
@@ -662797,7 +662799,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html": [
-   "32248c739405ee3c48b3504fd33d6fd055ecc60c",
+   "2ae899937a5d342fbb11b7cd26cf118f763f4869",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html.headers": [
@@ -662805,7 +662807,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html": [
-   "4e41494b86965fdcb6a4e3d65418f871da8bc4cd",
+   "318ac0f04b6fdc4c9fca069b88dcdfbc5c1b12ae",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html.headers": [
@@ -662813,7 +662815,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html": [
-   "08973c57153dcbcf1ffb16743003881fe2d08637",
+   "ca48b235a3c1961dd6dfc2ce878ab147ae7c16c3",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html.headers": [
@@ -662821,7 +662823,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
-   "54629cb45b84d4fc2ee5771d4480c8685a718a76",
+   "1556581d911ca12ce901eb1984a2a370d29b02b7",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html.headers": [
@@ -662829,7 +662831,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html": [
-   "86379152972353e36a17ed56d1671b0e00d3dc49",
+   "c0284a4616d1e577c3df68e8f53d50715a76bb1a",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html.headers": [
@@ -662837,7 +662839,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html": [
-   "1e66182f098551ec947af88bce9e77dc2b753f08",
+   "8d701f4364ad38fcf79bc812361e0ed02e84f302",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html.headers": [
@@ -662845,7 +662847,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html": [
-   "289a4a50700fa721faa2c130801fca9298c25562",
+   "3ac0dcc9512574dd4d7485bb090358135cfaa638",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html.headers": [
@@ -662853,7 +662855,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
-   "4d44a10b7645fcab9ecee358ee622855e359ea10",
+   "3450d8e1de8a5e6a2063ee552c074d90af1f558f",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html.headers": [
@@ -662861,7 +662863,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html": [
-   "d76ff641aa5872fb5899a19ae71fd404b034519a",
+   "2aed29beb92e6d13b0fa49597d13f3daf39a3a36",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html.headers": [
@@ -662869,7 +662871,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
-   "37d4e3e46e725d53905563fde08440b820c365b2",
+   "594eb72381e07d43201875c4d09eb5c8d055b99c",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html.headers": [
@@ -662877,7 +662879,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html": [
-   "2757dabaad9c1f789c18e3d35a6adaef1518eb40",
+   "6531c27e787450318e4d85d808e483198a2410d6",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.headers": [
@@ -662885,7 +662887,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html": [
-   "8a405470c4a0f3c28a59029cb794b96b83a5c1fa",
+   "f3ea627adf959b68b7f36036c4f7e58e80fbb6ee",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.headers": [
@@ -662893,7 +662895,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html": [
-   "f5c690b8bfb136219fda6d61aa9f6fc5a2c2d90c",
+   "6abc50ecc594a27ef15e2262f4506e0717559f4a",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.headers": [
@@ -662901,7 +662903,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html": [
-   "ba1424c06188e72c68341332a6b1103800288dd1",
+   "6f11fcc8b054b8599e0b4042dc67e1ad25d6f023",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html.headers": [
@@ -662909,7 +662911,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html": [
-   "7aebb65a521f1fbd55f563d240213da26b68be97",
+   "2a7ea1cedfc0868cfa2fb61b3f4c69b45f136fd0",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html.headers": [
@@ -662917,7 +662919,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html": [
-   "8d145be6b4f0ffcdfe1fd126b74c41f30b9ef879",
+   "dd9cacd10243dabd3226bd107e21b0e13a848b66",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html.headers": [
@@ -662925,7 +662927,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html": [
-   "6d334876d90077a29702f5c4f484e9cecdb6a33b",
+   "67d90cd44b536e3831dcd764db82076e555e4053",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html.headers": [
@@ -662933,7 +662935,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html": [
-   "941dd867f2c7c27f35bc43daeeb300e604fd302f",
+   "c6962cf03cf2361c8952b841fcc856e3b516ff7d",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html.headers": [
@@ -662941,7 +662943,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html": [
-   "41e0570ec7854bb6ec922d614656b24a91a359e2",
+   "d7f3d697bbb9d413cf7171794ed82ad77dad796b",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html.headers": [
@@ -662949,7 +662951,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
-   "1af12eb18e3224084f92d282fca51ec7d27f1c11",
+   "8076d219244bfbd1a9c487b3b936867230f61ef0",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html.headers": [
@@ -662957,7 +662959,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html": [
-   "8f72529b6fb6d6751e971350c8ea49753d273d1c",
+   "7512b2edb96d78037e62a996a7c1912155e38217",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -662965,7 +662967,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html": [
-   "36e5d0a32c82b7492a897723d1e2daf2058a68eb",
+   "61a4547ee8316e3def655fbc061f09c764c6d346",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html.headers": [
@@ -662973,7 +662975,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "87cc414978a32d17ad21af3db8890efbc57eda50",
+   "2317603713812e47f0186634805f595d56d359f1",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -662981,7 +662983,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "41d8f63f2dff83823f0207d5a58db6ab65668a62",
+   "d256320b428a4e5e4d94be7261966931af3de7e0",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -662989,7 +662991,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html": [
-   "e9082a8036a10eb5bee386f2c8cec6f9a5184b55",
+   "54a2aeeabe4f3547acc3f01f83c2f8269f63c94b",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html.headers": [
@@ -662997,7 +662999,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "731cb633995a0065fcce5b0227d18f38a3445f6f",
+   "d2f96231f11b03fc4fd9c501ed15d62a6b3d9c45",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -663005,7 +663007,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "94a1ceca87d054ec34301d0070f530000f429385",
+   "39344d054d2f96a3ea471d3dda0fc6634f2a01bf",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -663013,7 +663015,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html": [
-   "0e0fc8e5b5fd895e5718baceea9d0779d8460972",
+   "aa394e3a5a7df91612872335c1359400d22c9918",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html.headers": [
@@ -663021,7 +663023,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "b5f8a4cbd3fa7de9617e749dc356c5df6f88d161",
+   "b1cd787f6825a54f164aaf059a9bc9fe7534ea80",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -663029,7 +663031,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html": [
-   "8da4f3b3be0d75ddb57d280e2b9de46c0479c607",
+   "632f1e32a0c5d115bf95c64d210a43a610c485f5",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -663037,7 +663039,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html": [
-   "424221d94140ef5b31500f0f3e4fcf0cd5e4047f",
+   "2525a167f469c856b716bf3466dfef46f7508471",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html.headers": [
@@ -663045,7 +663047,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "bbc8f26a58338d88d412759d3dc8d212fe36c6a8",
+   "1d754d24a8a0250827617656f3806fa4d189cb7b",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -663053,7 +663055,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html": [
-   "d373139d1e20ab2b61234eaecf83bf9be2c9245c",
+   "8776fdc008365774d03549e1225e0b82f0fc2e90",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html.headers": [
@@ -663061,7 +663063,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "49468d12539f9274e073feb4fe7c07d5d0bc00a5",
+   "ff1f271128fbaf52801a2f44fa10dbc485540aac",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -663069,7 +663071,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html": [
-   "84f4c4707ed09329f26b5751cf508a4b7243519b",
+   "9b189b5f669baaba1e7e6f61d193693b6a871503",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -663077,7 +663079,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html": [
-   "e7d9438c14b43d23476c35a69f5a49fe92981d8f",
+   "b190d3b199df383d9d2c70983f7198e34714b847",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html.headers": [
@@ -663085,7 +663087,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html": [
-   "5f8f6c1e79275c66e419d5e01b0679a8b284d722",
+   "84bf6dad89caae94345f26334e319115a46bed3b",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -663093,7 +663095,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html": [
-   "44413d7b167d41630e66b435fa146df063d14c29",
+   "d7efdd2da6ed86603a7f951c4ea0c5bf56fe0a8d",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html.headers": [
@@ -663101,7 +663103,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html": [
-   "c3be3878ed064f655eadeb1028d325e14a426b36",
+   "dd169e50c8cb239833881dfc101e45fae1eeb9d9",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -663109,7 +663111,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html": [
-   "f4800516d7e7df585b1cd78c44d99389268a9d06",
+   "8806a014de2537b9f740a072adbf1f2538a517e8",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html.headers": [
@@ -663117,7 +663119,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "ce60482bd768e8d7b8c89ca32c79ff0ded46299a",
+   "e4ce94ad2b8880f6a261345c79729154d8494095",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -663125,7 +663127,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "5714a7e068b8a0c49a10d671d029dce7997b4e49",
+   "f1fbb2b4179e1a7aa7d9e745f3b5af49776ae9bb",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -663133,7 +663135,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "ca5c1fd4b0455d8c17debd60e07771103b221e6b",
+   "1555a3d827a6c958dc4996d184506105ea9d404c",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -663141,7 +663143,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "934fb53a6e040a034999023a7f1b03590c77411a",
+   "7e27cfdc32071750adfe2847e8c14e4b92949848",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -663149,7 +663151,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "755075a17a1d5f5652a14944d1d061cc97efcba7",
+   "b716504830bf11e2994e2c4df9ecbd53bb63200d",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -663157,7 +663159,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "56c1bdb7dd4c07087aaafe2cc83afb0cda5e0b20",
+   "0c8e45be8757fcf1faecb7c704be177b7f4355fa",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -663165,239 +663167,239 @@
    "support"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html": [
-   "319db6a902f8884a2e9f85285f95c8b4159db9f0",
+   "22b88b8b66fc486166ee27924d651b2498c0031b",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html": [
-   "98643446686ac0db129130a6c7a0e9e959ec1d1a",
+   "ec43372bfb1f1d9b7f637f44d28efed2e5d5cfe2",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html": [
-   "a70bbb7ff1359fafdb65ca2c5aaa186347afdf81",
+   "88f90ba82458b879da86d28e7cf32cd796214061",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html": [
-   "2199fbacc2ee22a18489de877f9011549273d8f7",
+   "5f24b6e4dc68e66c604514431e0b9f1733b41765",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
-   "0038a1a78abe0ca06365fab672f639817834f26e",
+   "0d03f45be5633d86536ec98ae5549b448bb7f813",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html": [
-   "8555bc6ccfdcbb6b603aa0736da29db5cf7d4ff3",
+   "b289aa53466fadedaf6fb0f07f32095c5fb360e7",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
-   "bd2014b069f64d139cc9d4e0cb53a3496e2c2070",
+   "e7001e502cbde99287e2509047937a97ba545850",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html": [
-   "b519ebcfbc2362cf579dfd0dbb7a093e53f8dd35",
+   "903030acab07048fd1f8c856d92467b4e8e75b15",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html": [
-   "a70f22d69d0708be03bac50ac0bf380207ca23f6",
+   "d0d28622838f34c4e53d9cd9d200ed17d4b4d3a8",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html": [
-   "633938985b4f573636c7ed91f00b0f04e997f2ef",
+   "b6c3033e8f06cf0d5670076ad592af70f7bb2328",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html": [
-   "b9eefbc30428f03e639489f6faa8a7766868bc0d",
+   "d714cf6cfcf89984ba5ab30e33d771c5d854867d",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html": [
-   "82fc3b114408f1f4eb298a940d6c8f76c1292d09",
+   "5c37342fc29afd87e34f23a373a475620481d1f5",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html": [
-   "bbcbe233fbffce62d67ef699bea09224266206dd",
+   "219a866303d50c160cf0eee0d97fddf8ba972bdd",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html": [
-   "fd270955f7446f05edacdce97c6e7533638e52a0",
+   "bab1422ce4f802cac0480355f3136926a5dfaf7b",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html": [
-   "4739c58478c621625ddabb2a7e5a9665a1b11457",
+   "dcb2fef2e5eb7354e66638c127cd5bc4a98e57d1",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html": [
-   "fe6f02837a2218d9c85bb98ea6157e295e65fb35",
+   "4afe764b7475600e245b51dd7750ea0c37a8253d",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
-   "80f337f9e74f2368f6c3a8716cd4661cfa2a220b",
+   "59c9006ac0076fe38e9e003a6bd940cc00d2d09c",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html": [
-   "5d0f8168ca8a8ea11f69f6cfeccbda6618615aee",
+   "ecc047cd0d180a3f9c91e9b9a5eabbe7df1f0c48",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html": [
-   "3a4fb95e8252df98ab4027615d2da731ea3e89ad",
+   "3bc5d625b4ea838aca232bd9918b0609df0f6a0f",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html": [
-   "20c2f4f497d69301c02fb191d0c46c31785062c2",
+   "f0b53109a4f28b63fb13fbf598309be436710932",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
-   "d3ad1f9c42426453407978d3190bf00ba89735d5",
+   "e3819a3a25d30d2a725f66a26ecadac3567fbc3a",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html": [
-   "5de6a24aa4baf39f9fe97a379a56cc0c2e5447ac",
+   "b6ac8b10fc9394f0dde620367f14aac54129dafc",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
-   "d39c95d82dc86f0e09b3644e44d3062fadac6ac0",
+   "2b9112f6f128e065a5327a54b10b9caf25ae8377",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html": [
-   "df9f3a839898d2e024d6161cba4a955537781d2c",
+   "9ee2002a7c351dab7ad5e2f89e114ea8ed5541cf",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html": [
-   "729839842efba389009e9cd76ef70d9a3de92b0b",
+   "2c4115e98fda49951b41192ce2bdf6882455b9b1",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html": [
-   "f5e5c5230c11954b66ace084601f6206a9fbd2d9",
+   "6f2bfd58ff695e49d247e721f75c200a8bce2d9b",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html": [
-   "5e03688c43153054f6d0433757467b3ead730e28",
+   "b10591c4cd9fd59b069dfe97f7ee030d47d36731",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html": [
-   "346e401ef9b4056b59e13488f0200236cb911ee6",
+   "b7fbd2643d1d3464bc37e0c66769626cd9ce10a9",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html": [
-   "27d89b3c0cb48846d0f1890ecede3d4995c051a8",
+   "da50e5c4fe262db3ef4b3aba90898171fd45f84f",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html": [
-   "045dc06177addf2492d2d0ebbe6caa225591314e",
+   "7830d6f47be585befac5971a8f68a0632c56434f",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html": [
-   "aadf71777465c612e720de8b7337fa01a0acb9e4",
+   "99dd29eefba5511b4175e3a130446787285b47d4",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html": [
-   "aada3951f9671d07557f2966f5d86ac5f2c09800",
+   "465007eb75440413eba0e26662c94102ab921b59",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
-   "ab255afb9bd5240ac09eaafb5dfde867081c6785",
+   "a88aa71cfaff59b7f9a181a855efa67fc7556134",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html": [
-   "9bbbfb72fcde2fea9fb4f2a46c05f49d1aff3dba",
+   "3f8cae052646a9cc450d470f56fd17dce5fccf11",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html": [
-   "6d7a54cdb11de39bfd9f447d8a73dcc3a736d025",
+   "d92b1c116cf86ee8912a5a50516c4273d897225b",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "8117e29c06a73589dde2ed75179842d2312c8b94",
+   "d8951158b03e5ccf8f3c8321462061c0405dfe8f",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "34859ed87a4c2c3f686fd4d47cbd8515a5947157",
+   "da4812eee49c6c1f769bef0935429c477a20e1cc",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html": [
-   "e73908952d227fe49da0b9a3e1ef15868ef6ae46",
+   "9254b47bd740641515214d3dfbb9942fd09f7bdb",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "0080977a7279c4030260aef7edb05db1309c63a2",
+   "3dd09242a8666d17e312605d1a8ca81248d10dea",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "155bf01095ad198bb0db32832a4ca18719cdee2c",
+   "14a541ae27a8139755713a2fb7d0205ee8421c20",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html": [
-   "7b3442d29e1b9b19e5ccffd567a9a0e3d140579d",
+   "1763d19a64230acfdfbf94e79a6ef52af5b95e4a",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "fe2b40c58d48dad8df2d4ed9dd54fbeb1ba59389",
+   "9ec70b6f80c1f251758730aa87d287f6f532fa04",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html": [
-   "c0d87fa32023fd8914ff1e0a1b438e6cd4ec0617",
+   "52d5a74214ea0178694b081907c196c6360db702",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html": [
-   "8586b96fe8b0e66ebfc6fa9c8bf4911d8500a50b",
+   "dd0c6631674b5ea3c48078abc6433603bbf957d1",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "18f3dbc804e5d2ba22a8df980744f01ffd8c1399",
+   "4f157deb995d3410862ffb36eaa58373eccbf1ce",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html": [
-   "f296512efad9861f9ef717e8c0a91b6344fab17f",
+   "7d233267d311302be70e073ba5e2de9ebe048310",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "8eaeb5cd8de90306c8661889c227a43facb39a9c",
+   "a1e1b9da5b51f860edb3907789ef644a2938e041",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html": [
-   "548025dafc32a8bdeb8abd176455cb79022929d5",
+   "b2bbee56b96d35e2979df8e5aa3a4824a0fd552c",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html": [
-   "d6e828c54d516a3d331ee6a3317ef2b567117df0",
+   "01c45482b29310d57c3ec3343b5643802795f40f",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html": [
-   "2e459e3d0592b65788e22636f383239429c1795f",
+   "f31661fc41c57755b5ee92d90bfd303ea1b21340",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html": [
-   "0760ef944d866441b1fd55640ceaaec672278671",
+   "68c1c1076fa23feb673e83bca83a0e32e9c642a1",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html": [
-   "9ca4512215a1d6ed348fea0632b41439b5c6988c",
+   "c301290fa9b6b52cb0108dc07bbab9d358aa4cdd",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html": [
-   "a8ec1e6acf1dd060d4384e77a5d902a60b8bc9cb",
+   "02109248fbc814325fdb8c9ac783a32b333b9c0b",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "5fdacce40e7849fe6275b76e6670e9174ff7488d",
+   "d8de5bbd9744fca9d8534cdec08549522bfc5fcb",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "cac271986ec551d1a5c2a8e93691881613590887",
+   "4a376c18d6d76b2db80d6bfa44802e4d9daab3bf",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "7023a52beae5990220427450b3a8110fcb7633b7",
+   "64d2fced4a61dd34a37edd6d3efdd626c2cbb0ef",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "a6be79bcd4a54cb82b1cb565166173443e588be4",
+   "b6966365114d725b1ffaf22fa2d696664f6aff78",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "70602133f8482c968f7ac1494e0b554c8ac123bb",
+   "591f211dc02b8a824569a8b6196d48abb764d290",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "27a95b7ad14a35e5fdb76dac38e52d121ca8dbeb",
+   "fc88896bc4b7b2becfecb996a1693b42e236ce8f",
    "testharness"
   ],
   "referrer-policy/spec.src.json": [
@@ -663409,167 +663411,167 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html": [
-   "0f00dc411852902350484b10bb52f6f6b7581170",
+   "0c23a10a2dc11ffa766a8cd8f6d2752ecda954b7",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html": [
-   "410b5da8bad394590a8e08f04a990d86443b1880",
+   "05d3c57afef26f228e7863d7d2d9eb4b1c80c69b",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html": [
-   "ee981716bb176a4ab5a89ba8f5a84ad71680291c",
+   "649fc0bb3d98f75f3aab89e6b903b8347c871770",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html": [
-   "7f80e3dc6137ee576637537edf4be86c9b598d13",
+   "ceb1df9c82579f905343a023d7041bedacf3f5e9",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html": [
-   "e1acb81c2ed86f96e9fb8051c23af0567677af61",
+   "518a983bd0f4b1b0c301126d7a8355ffac2a588c",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html": [
-   "8f524a23ecb6029bcd6f9536044f07bb2916528e",
+   "1891f73b445d7f9e4442a9b47c950a832874998a",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html": [
-   "d1d3bfbf4cf8a4be267d745ca27dd46374adf197",
+   "0510bad2d5075d086f5219b07227c786dc54cfd8",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html": [
-   "aa2b89c0219cb62469f3057b44a981dcd4c32375",
+   "36d2e8bdd190b70dcd06ae5318f0f79b5de2e225",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html": [
-   "3d35d85a8a3fbebc973155643d26867953503823",
+   "9235e2fab57da7b23d910ecd63162ce6a98d9c12",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html": [
-   "6185377c16f501a4e0efac657812ca3bf19e817c",
+   "4ed01baae9e9a15fead1dd56b698f370b3b9d7a6",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "9e10c7fa3487946a1b49ecc63d6d7099fa135223",
+   "1d76bd4ee31e2551e8aa897a3765800820e00c05",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "6b6302a6a3e7f78f5628053ad522962929cace28",
+   "ea4a9cd9a70f33650afa8277dba335d5126576aa",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "bcdf715662d92053ec672a4dba097d72c99fe883",
+   "113c6de0b3a7a1a7c633b28717305fc94f51da0c",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "18ec84b8a53e09b71509b702b3f3cd8a9294bbba",
+   "9a13daabc2a39a814e18c59bd4d42e33db4673ae",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "07bcce770a9a6396eff922da57b28eab6f9837e2",
+   "d611bb5ef5ba90aff35afef1635ba023471f9c95",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "81c5c0b89b3503dc13cbbd7484d184642137ed08",
+   "e6a2f230bc47fc47c11333677f35de9ec7f1f38f",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "3e08734ae731efb7a42c3f2695ff3a7b5f63f739",
+   "61ab89776914339cd6d7a1219a075ca34cbefb58",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "ad88c2de7a0ddefa9730dc1b9b9ae860e63ea2e4",
+   "8f69b50885c2372e506063fe18c0a5496b102a73",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "62cfcfbf644eea12e93644aa9d532000d2c25e9d",
+   "00ec7fdac7464fa75a7b52d4611033db95bc19fd",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "867f86fc9378a1db6566eaa6fda6471d45d7cfc2",
+   "c36fc8dd98730634f6e00edada9d67860ec5dbb1",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html": [
-   "8ab2c077ffcad590f786304f1a63b14de73162e0",
+   "977b03a760a6c5ff6ba67579dba03fe78b2f5473",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html": [
-   "14ffec0f8223895720b87c272c84cab0445b1a37",
+   "6665152dcbaddb8210380350b7dbb069ffeceb1b",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html": [
-   "1dd3145951f80576a951f43b63602a7b8c19307d",
+   "b3212e1130b3e4cf6c215668f8510804b27c893b",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html": [
-   "fbda921ea18611e5712e0b861aa4235e3fe3bd89",
+   "ebb494d4ad4e605abb0a617eb3e07a81b80fdaaa",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html": [
-   "0ba667d9c74eed392a5cb233a39fefd03c170e1f",
+   "b43d0d9d83b3cd3d31e35160d8c4c2dd25049187",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html": [
-   "abbc2d80fcac3d4cdb0027f3acfab84cf9103181",
+   "0b7fff638ff03ecc257076dc0f073b6d0b544476",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html": [
-   "71b1a9038a2e4f2304dc387b364f4751de89afc9",
+   "95b684b4ffebfcf3ea05ce81ed3fdd9c0efa7e5b",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html": [
-   "6466b7f149f5c47c79e6688bc72816b65f4d7992",
+   "aaf4952cedad08784a67aa3e13225bb86ae0578c",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html": [
-   "a86dca24c3757a053c20580aaab1bcddfa3cc5f2",
+   "e812d9a3b844d4319024ed45ae4802f8c91ca877",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html": [
-   "6936906ab3eea4ae4c835399f6a572610287b391",
+   "70e0de3d4aa9a3c802d3f2b4a015c65868013349",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "44b03ee27d2253efe4e35773690dffc087e57b8e",
+   "ed76f75b539b205d3525fd4dbe0251e84db02604",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "f21693a2904f7386722af4ae736657992eaeaaad",
+   "181b14f75faff46cd393712857d32baf0ef8fb8f",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "5ecad4840a7c74b4695d8b52c57b5d77b7731809",
+   "9f85cba2b10b2754609db4c1f80c7a1f6db1ce0c",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "4a37ed845dde75650a5318a2c4b870fcade33e82",
+   "873f53f0c2cb54b9d5c058403c89029b761667ce",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "44d4afad9c3653dbca68a0be5d2590c48c5d693f",
+   "5c680ed73dba496ace8a38ade440cc7bf87dfd66",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "e0135ac6550b73a89e07926931a9e9aac07b7b93",
+   "9adb33a0ab131da2147a767d9fdac2ff92274f54",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "c03ac3ec36ee4ed3e3f73c324ec78251b65988ae",
+   "c01fdd4269e41d39417e4f3dc3527100c7c53cf1",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "81f8677c333365adf21420d086eedc44b61fa49e",
+   "b72ab9603dd382ae1f7b29e2fa3814054d7fd686",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "79b6a081e17fdc5d067c3e0257c00d5222ce3a43",
+   "f4d4be6a33b830417d66fd985927a52b81383c36",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "0517a5d4420e18ad2eb81803e95e6d3a28237a93",
+   "690c3f5329e81a9f768a11b0c640b34225471037",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html": [
-   "e49741ffb27076a0af0096115126cd463d026bcd",
+   "e64a4894af61d2fd2b26d5ecb94519a1a435eb7b",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html.headers": [
@@ -663577,7 +663579,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html": [
-   "78028ea112b569b1c88996b55363e59c57fc0771",
+   "6bc062c8a4258227181935054e4c23be8b21d08b",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html.headers": [
@@ -663585,7 +663587,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html": [
-   "b436f264f46efa4b77d3e1686ea497382a487ed4",
+   "58feb6dfd1e6db96b569c0bfb5ba2da870b684c1",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html.headers": [
@@ -663593,7 +663595,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html": [
-   "7f0b239b625d9f4580db55479c09dbebe8514aab",
+   "ffff41d39f72f812d688a43154baf08634f8adc8",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html.headers": [
@@ -663601,7 +663603,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html": [
-   "7d8657595e3608a88952d733ea304fa17c74d90c",
+   "efb17d6a4bada735f57ff363d160e382f070dfc1",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html.headers": [
@@ -663609,7 +663611,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html": [
-   "cf0764bda250e14f8a6f7b535581e3eb9c32aa23",
+   "ce5dbd7ab29c524a221c91b4a05e1f2c190b5862",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html.headers": [
@@ -663617,7 +663619,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html": [
-   "68f7480b4d97c8faa46c006c81c11c26ac0788c2",
+   "34c1e30664676a58d439fe52cb165b7558ce93ca",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html.headers": [
@@ -663625,7 +663627,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html": [
-   "713b5eeb4d469505f1e730192ddadeaa0ed5953a",
+   "07d55711174298f4ec42248c7aad0801ffe76624",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html.headers": [
@@ -663633,7 +663635,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html": [
-   "5ce05593ccf4755086e7ea99a2cca5d04ed0ca4e",
+   "dcde036dca48bfa8a0fa0d45325192dee38776ef",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html.headers": [
@@ -663641,7 +663643,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html": [
-   "e1b43a7bd76a647e47bcb4a7d493719bd406a180",
+   "f5efe8c0763d915ed31b7c442763cc8ff1388299",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html.headers": [
@@ -663649,7 +663651,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html": [
-   "57e841048c1203a739b9ad487f7471fae300757f",
+   "95939f1e55d55d70b494c375e7083d06676b3fb4",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html.headers": [
@@ -663657,7 +663659,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html": [
-   "220448dd230dd4a3b3efa9c96f7d27199e88f7ea",
+   "406344590436f8b767f55f3175f51d926c9c49fa",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html.headers": [
@@ -663665,7 +663667,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html": [
-   "1bf99f140246349a4db73eccabf64a30f2fb8844",
+   "a520b09e762cab4ab8f3e6bfe05e102530f0adcf",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html.headers": [
@@ -663673,7 +663675,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html": [
-   "4b41fa5b88c238e5c64549f3c5525c41558bc984",
+   "a1284bdf979ee893f2083aa0a0918df75caff7db",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html.headers": [
@@ -663681,7 +663683,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html": [
-   "f46debfbe650f275a533eef0ad9739619469d221",
+   "c4d04afdb5fe9565d33d90c7c6ea20f11e09811e",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html.headers": [
@@ -663689,7 +663691,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html": [
-   "7642d2f3def8d4be70e12f29b123814e427489b7",
+   "585b273609171660f42912c97ca7e702ffa88989",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html.headers": [
@@ -663697,7 +663699,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "66928c51c3f6b4c061ded5dc9dfd0824ca6fbe79",
+   "6f68668154628e8de352dcc6eee6db6019353203",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -663705,7 +663707,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "23dddef080c995247001733368d6286f3315f2b8",
+   "d7cad6d1aa0d2af385ac76c43ca44455458c0190",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -663713,7 +663715,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "41eb7eaa35a769a7e473d3383e39e00fd5e645a7",
+   "e5d8f02cc5d6c506dca0290d56a5911f691d4344",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.headers": [
@@ -663721,7 +663723,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "fa964a4a4d6616a7b6e5e989c5b348dd82ef8c1f",
+   "16cbf34746c9ea7c5debdc72b70e938d3c0ec221",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -663729,7 +663731,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "a973b979eefeb8e35a92b98592c9be9cbd0d80ce",
+   "14d77416a426a57ead31ae3215a0c16a075bfa59",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -663737,7 +663739,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "8e6ca11f3f404b44eb559d69952f7f5d79c1068a",
+   "778169fc059fac4e992429a05bcd9bfbc00e587f",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -663745,7 +663747,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "7073af2d60ef289afa28a7964dbc3e74209cc2a0",
+   "fd7e6df3b2d63b2afe13fd59273fe15579f00750",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -663753,7 +663755,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "6554f6cfc40cd20f578edaac35a2a63b815ceadd",
+   "af30f3629062bd50145a550330063eb930d31508",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -663761,7 +663763,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "65f8a5621e85d5fe4dcef63d30fcf6bc73809f51",
+   "53d4bc14c66354d8ccaecb55c44d123029cf80a7",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -663769,7 +663771,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "9c0a097c4b11e8b5e86ade832c806f09e512227b",
+   "b65e35e7fafce533f690a63d0016fb3c5625cf33",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -663777,7 +663779,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "f456395c4c11ded93fd4b8df220af6aa39737b73",
+   "2e774aff9a10d3c2f8a9cc2895e8d477f3556edc",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -663785,7 +663787,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "6943ffa982bc1faadbcedb1c21215abe0929cbb8",
+   "44d5a7e86452911a2fe70ac6108bfec67702d26b",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -663793,7 +663795,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "b14bb43a99cb9c425214e003d0627102c9eb8d2f",
+   "e0a1190722dd2a02a0a24209602f1a6f01cb57da",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -663801,7 +663803,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "b9275cb0f0c8be08c11e9827e346d4a7a9da9fb9",
+   "862a53dc05bef9b9c2fefa50cc7a4b652047382d",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -663809,7 +663811,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "947e631d1bfface02019d76ff3da844f51a2a58f",
+   "78f77cc46ae9965c9c7ed192e04d1f4d5fa63bc1",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers": [
@@ -663817,7 +663819,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "f6c8623a069e3d9b08ecc3bbf6f48720ceec70a6",
+   "fcc8004d96edca6c5077ca6d7de49c7251666be4",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -663825,7 +663827,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html": [
-   "cddec2b7421bf1a5c723d5a3cc880682b016047e",
+   "9db05933d7671ce9b9f9806da737b4336a5c8370",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html.headers": [
@@ -663833,7 +663835,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html": [
-   "08135c2a892882d03d8badc2c2132d0b235b90ad",
+   "e1cd5ce74907693a6d540bc7e0c8c661f4bb4c3a",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html.headers": [
@@ -663841,7 +663843,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html": [
-   "37fb15fef59ace9ce28dbc7cca982979bba04004",
+   "e8966a3dd407f299f1c92b53d0a697db04710922",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html.headers": [
@@ -663849,7 +663851,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html": [
-   "3c35f06227628a9ab8d01b46ce0eca73a1faa62b",
+   "5ca9fa74e7e678581bf705b3ca3f648277a08fd8",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html.headers": [
@@ -663857,7 +663859,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html": [
-   "0c49b4e91a6df0bf0b7003b2b8743ed5953ad09c",
+   "3756bc90866dca7428fbc031c022e254a851f2f8",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html.headers": [
@@ -663865,7 +663867,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html": [
-   "bc930390574b2301c20593930b6539f68537fd55",
+   "de03c558be7a130519fe417cf017a8a6dc0aae07",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html.headers": [
@@ -663873,7 +663875,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html": [
-   "af7d1df7a867a1ef4a8e6d5c11e026f2f6aeba22",
+   "a47402f8e5a7ae176e6613a9c42285d5c745cd78",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html.headers": [
@@ -663881,7 +663883,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html": [
-   "b40e40125ba88a58f2b7537d7b9a2e2ebfc84498",
+   "55d3eb108d9117af47bc4490e6bc30a848cd5462",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html.headers": [
@@ -663889,7 +663891,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html": [
-   "fe66263f7894dd2272a4aa701f2af85dfaf3c04d",
+   "1f4182fc9b833931107b87819a80f8d837f0d4ac",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html.headers": [
@@ -663897,7 +663899,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html": [
-   "4f5483753de4921ad4e44414da3718be69a3eca0",
+   "1df1aea63862a0a3c3ca57a3c988b7678364abaf",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html.headers": [
@@ -663905,7 +663907,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-insecure.http.html": [
-   "80d2dcd0787beeed2e906f31d1f562f1b83d2c26",
+   "e61424294592c96a4db9799bee9043fae55d596a",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-insecure.http.html.headers": [
@@ -663913,7 +663915,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-insecure.http.html": [
-   "695afae60374a9604c9314701a0fe5193b26c48f",
+   "25c47754396d62d860b852c3a525149b2eaf4666",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-insecure.http.html.headers": [
@@ -663921,7 +663923,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html": [
-   "16c752ce04c794227da700bb8f588aefea4e4f6b",
+   "5098411274baa131dcae0cf8667b8cb5e07b2dde",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html.headers": [
@@ -663929,7 +663931,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html": [
-   "6acc89c80d21767d01f4dc5e4e20289dd24d006b",
+   "ce461d48838fc1c59391695ab832cadb247a6819",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html.headers": [
@@ -663937,7 +663939,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html": [
-   "7620c0160525d90dfffbacfef5ec5665952bc1fb",
+   "595ff8cda81355d0a1f7479e3007f14052558a4a",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html.headers": [
@@ -663945,7 +663947,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html": [
-   "ae16346f3adfaed3558324ace8420607966de5ae",
+   "25628c57045abb3f7df3cd9927933e69f7b6befc",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html.headers": [
@@ -663953,7 +663955,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html": [
-   "118bb0a3c4543e4ddb24d4a7e20668e0dbee943f",
+   "59b5540d5373989c1f2158abb99d6010ddfc61da",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html.headers": [
@@ -663961,7 +663963,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html": [
-   "df71263b21b8dddb35cf19d5e8ec03a16a2f056d",
+   "90c9c062897f9a60c3ceb8ccd9708b16d2780dd2",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html.headers": [
@@ -663969,7 +663971,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html": [
-   "c71cd293d230f9b0d19030c1d4299efbe8793816",
+   "c0c4d57a6b53d3730fc715d6c4afdd63a455e6b3",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html.headers": [
@@ -663977,7 +663979,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html": [
-   "d5979d7ab667111832c413ed80e2387dad5cc3f2",
+   "df3d3caf697d7cfb3e86f60ffb70c261e9ed9831",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html.headers": [
@@ -663985,7 +663987,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html": [
-   "b6bedeeb00bcdf2f08afdf18ea9fa657f5523adc",
+   "12cd2108c2d95dcbdbdcd92582e599f0ddb33d53",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html.headers": [
@@ -663993,7 +663995,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html": [
-   "7baab77a09fb95bd0f46ef4fd16eac7f0ece68dc",
+   "afa379cbe44fd6daea73471fee3d66cf1615b11b",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html.headers": [
@@ -664001,7 +664003,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "693c23702ee88ffdd84a25bdd7802effd5adf3d3",
+   "69ffdead833da66ae08c3cee35f6f4981878bc2c",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -664009,7 +664011,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "fa61f3528a74365a5d8a966137fe5d9eb244af2a",
+   "0310cd68153883f187b2750e1238e30bae850e91",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -664017,7 +664019,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "316e28af94ca60f8e603fd3b8b95784235829aeb",
+   "85d66187d221c73b7f7338adc09005faf734060d",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.headers": [
@@ -664025,7 +664027,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "f08708b1e3245b4daa5dfd29b6b5885bc5d06290",
+   "2e4e2e4b0e90ff133fa7ed55a38b13c63755c9a8",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -664033,7 +664035,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "c922dd30265655f67987a0a301555223683a6053",
+   "21a46331bdc8a0d7d6624078df76800f6477ad04",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -664041,7 +664043,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "dbbc064641238e3a8619f3c0ed0f870369b0b94b",
+   "393b25128ec7b911110171f9c0be7cc81f887040",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -664049,7 +664051,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "cd93f802cad62375c352d3cb90ad210fa1bb2dfe",
+   "5c96b21ab4cb502a688c7b3041fc9bceddc1b6da",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -664057,7 +664059,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "2ce4f8c4f357c2b179dbbebd6355b1dc1826e3c1",
+   "c5715052dfa66cf2c062a44a82718b6a2491283f",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -664065,7 +664067,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "05cd14306e8a1aaa47b0798c04c8b19f762988a9",
+   "3bc071771cb33de920530839ac9f81bd2cc0202a",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -664073,7 +664075,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "6c0eee6a9730feb2f932e110bd150f9e249746c4",
+   "4db9193f982e7503b7fe54c3f96b3500dec473a1",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -664081,7 +664083,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "55f137e6d5c3b6d3ce7f7454a2bd4f1815a919f5",
+   "59ce04e05015fb077858ce24bbcd9f0aaea2251b",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -664089,7 +664091,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "c13e87d458bef2b460140d785163f9dacef9fd8e",
+   "c3fcd6c749affbe2967f8469d0ea193943bb6f1d",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -664097,7 +664099,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "ed886aa24102578518a96cd1ebe403a8d26fcab6",
+   "9f60ef4828d1667950cb0742aa2702272f0a4b3c",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -664105,7 +664107,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "2cf0c49c10b0e25295ab741766ea24e2bb937a57",
+   "fdcf4ed4b4dc2f860a99c9e1162e65323ccdde65",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -664113,7 +664115,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "c06e5fa468783001c960d1f83b255c8acdf92e56",
+   "a9cb84bd57c7bfced6525f559730be5369ab7e85",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers": [
@@ -664121,7 +664123,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "f29aae30d574b11a0f345d56ce2d8acbeb7c66b5",
+   "4188c7062136e4cea098bf14135a71efde140779",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -664129,447 +664131,447 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html": [
-   "dbe403fc39de5aa5013a4b1154d706472664e656",
+   "5c7e811b6a2b3e2b74dd461b0f1c88f123119b28",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html": [
-   "5d8c30513a5d24226b7bad0fb3a2b1ede47d2326",
+   "adc20b102726a90a05d33f39ee247dbe192c938d",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html": [
-   "fb54ac71aae594ba17f56629b0c171eac1d2dc71",
+   "14c5f88565f4fe0ac74689f91db2b92c07d8471f",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html": [
-   "4e71ba5f1220f5851aceecb6617164d87dd8509b",
+   "1f7660e4b44733d7d62aae3550518482c0ae0647",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html": [
-   "feb537fbc239948b9483277fb6f7a6080f10fcd9",
+   "2a8ebc516130a9ae9236eaae405a5abd3abd3306",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html": [
-   "6dba08c88def09456ca1a7046ce35bf9077724f9",
+   "52204f86a53e258be2c77723610b126937fc166b",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html": [
-   "d40ed50fffe10adc9f79a062a76bf1a80f2b9259",
+   "b9276fb2f6b1e75e45a50bb8c0a11208dc46fd19",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html": [
-   "ba6cc74c474033a783ce7c950caf28abbb00955f",
+   "9ce539405820d4280cb3953b7854cb0cc7aa970a",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html": [
-   "285c361d1d1b740bbc76337918e73a24302bddfa",
+   "16f65d24374c58c00ebad35e0fddd028229d03cb",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html": [
-   "29976794882fe3fd98641dc96bcc3b3767c8cb6b",
+   "9178670ec75ef286d3e7a21e5e5236c2add30a04",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html": [
-   "dff241107ec79b0aa04bdf835aef1c110121ba1d",
+   "2187ed654518612c8e21aadcf62779418f555f35",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html": [
-   "6d11862edcaafd23e0fb0ccfcfefc31102b5b1b9",
+   "9481c4e3eefb7cac4a75dacbce5ffe363422d759",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html": [
-   "1fc31fe398fb56e47902b500de5dd71627af08db",
+   "87189f7a041145a21bdb4105d8712a55bcba991d",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html": [
-   "4a8a1f0488e850f21846f0b70137e34ec0a8a1d5",
+   "d91479b1687a3dc4e15563d80eb5d50e855c7661",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html": [
-   "68b177b6af332fdcb20d237fda54351aa0225a6e",
+   "04f2d1e115efa580a109f0a1c3c7934c1268ead4",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html": [
-   "68a648275fb185d099b31d9a4940eb908da83fca",
+   "c0a3a3fef35850bcecc3472c26e0fae276386b17",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "7b1ddac6e61ded3368a75ab70e6d1c9c5cdcada1",
+   "a7121fa4ed7f9fb46e7287aea48346f984d8e6f3",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "684dcaa146d6a1f089e8136ae1f7e7224d0da59d",
+   "5c945e119f72fcfb2f4f994b37d0beabfab856e8",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "ecfd82d0630e95fa67aaedd82547a0611471fed9",
+   "fa6bee08e75f34d3a81820f2562f88e60b749309",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "7071663d63455bd279ab44012a4a9cf5f73c553a",
+   "87b9c1894b6527201bbf5f1ebd6d3d2c54e1a68b",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "9d76145215cfef91278d8c2a54a88c35fed96c09",
+   "b09d94eb7bbbeb6615baf40b4ed849afe994adbf",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "f515e1d8a2ef0ac7691d2de57ef8e89875f852c9",
+   "4a0abcbac66f8dabd9e4c34e5e63e4a1175693f2",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "9bba4f399abb39fef17416ab3adaea3bddececb8",
+   "fda4a75c834febc81ebb5f2bc3eb27acd3a16247",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "b3d45d73923c9d10f5258b6c1cce6dbeb805d697",
+   "42eed76eb371538f6a6eb1007156672a30880ba0",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "0faae4a906a8bf33a4828d782c0aeb51b9202faf",
+   "575447c7e3f609f215f961d7023b85f91f8e0303",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "cc26b0961b8b9d14781825c96be2b19e23959db2",
+   "03ece498654a1eceb4c3b11ddbeda059c32b7c90",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "94b42818407c206b04fdc11b640386bbef7e7f7a",
+   "dc66954e2787b17cf02674ccef240b10e545768b",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "ffb2366aa46e6f1cbe4027acbe41f620ccd0b57a",
+   "e2302d26f201c1619abe278b379e7fc118f23e2a",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "b67826d7755d7ad42bf801691f4fc7ab803999b8",
+   "2ecbb3bb8831355b1355ea8d831412e2a07b11b7",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "596550e89990ccebae881b10d12d40f8567efe32",
+   "ae5bac974d88f4ef7953b58ef313a071ff400c40",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "dc8ee2a8f45e5339be6d3d7dc1a7e4a995b823d7",
+   "b2c6669de57f02a2c447f12d0a7f8fa89c7f6d5e",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "266d4ff267377f11eba8c8a69689bbc71483154f",
+   "72bc5f3adcce5808095c206ec0e31c196dd41d09",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html": [
-   "2e49fa6bc310b908845d942f210769f78a1eb557",
+   "c216eb8c8f9cefc97aa35f0f97059ef4733e6308",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html": [
-   "0e1f1375da1101962ab17757fd94f336a54212d2",
+   "a770bc11c7cc12c4f777167eefa0ab379dea3642",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html": [
-   "c00e3501c97072decc84ac74a714bc784f042b22",
+   "5d6f7b21463ee8b5749abfa4411e4691713f1be8",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html": [
-   "65aa8b72ecd8da3c57fb61dae8a2fa186045e84c",
+   "3612fc08b2c69c8b988750f71b30ebae8bd050f3",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html": [
-   "b3079d2dc9d71e1a6e50ca60c63e556200d5e0b6",
+   "44ce34312a30a4adbc94b42effa78d513e83c40c",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html": [
-   "c3ef7af0439b90d03dc39e472fd7cbda5145fa73",
+   "cc9bcb48c9f20cb6e1faabf435486bd19cab6e23",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html": [
-   "d21951e8997b00429bff48627c3617b923cf2271",
+   "dd271801aff6427b51d25c4d83e918cc52e46001",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html": [
-   "7077dfa12711b66f7b0293c68516abc5e2009f31",
+   "3818bdb23062e9fa62fd5f876062e4530027649b",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html": [
-   "e6b8211824cd2d0d8e77a4151703aca78d5af6b5",
+   "e3a8560e198db68fbeafaa20b57c1d4f18adfe66",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html": [
-   "28a143047e54ff10c972fd052d8be01186da4504",
+   "bb969a6b137825f64e08b4ff5b61c96904eb1d79",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-insecure.http.html": [
-   "a74c968cd6f62a03a210ce28cf9070ada039cff8",
+   "c2d2eef0933c61ac8f409040b42ccb214bfb3ed5",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-insecure.http.html": [
-   "e75274330b59cd092fedf6a8c00a2c7552105273",
+   "65f61af96c30b2fad94f726f8ee17c864d0614be",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html": [
-   "06e0cf6ccb57eefa6e13c117fa7a1ce5d6da7cd8",
+   "f96147aa9f81eb80cfcaa1206816756eaf3803a1",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html": [
-   "d9cfc360d9a068dd1087bb5e0b11c01a9993db82",
+   "15f8356c48634f648caff1bc142e7497a3faff6f",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html": [
-   "882de7e13decbe2f9178a16be01d8c09c4beb67c",
+   "7b37f77b0a54d8a2dd63f04087349d8f824b532a",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html": [
-   "a567c338861197fe93f9249faddc4bfb6f16efb2",
+   "2ee6670f1b4d7372d32505baaa7a9ac2c15b5726",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html": [
-   "ede59d3c13de50b4ca08b891a13f5085ddac4730",
+   "324200c0809c704f6b96b3ae60d5a4e10ff3a305",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html": [
-   "e9b7a295ab937e2010b67367d5487a870d795db7",
+   "7679e7f4c3a56e2445ac33a06022c0c086f9b03c",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html": [
-   "f9e58ca6f78b6c580a6fae9898be9ac4edd90546",
+   "01429fc8d583bc947e2a2b8149af0da2891faa25",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html": [
-   "2c9beb9b272b0846c0464ecf39f97db3bc37de55",
+   "35a67d5cfe64402c69557f3f00458a11d1f16b04",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html": [
-   "2da9b429ec7c5fc9ca10d1d9d48122b185908357",
+   "6655e6609c7deb0cd8678521dc2a311a6ca9c985",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html": [
-   "61b40b556707d87c1cec14bdc863fa7a210b36e7",
+   "cf425621db76ffda9a78b091e92efcc6aecb3ed5",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "3e10a769b59337df15c1d4c4f12f7c7f0fa35158",
+   "3bfba05055e3735a7885883736581f1050f8c2d0",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "3dc9ca4eded6a70ab3c7e40190f74593fc4d7d45",
+   "7682dc3dcf84078e7fcff89a3c9ccaf183443d28",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "fa5788b514de7284606fc9e3c8f1a6d7439e0ff7",
+   "f438db21fb2ad3c504387044c6fc808a2d1b3130",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "f226759df6ed7d4de6069626214e1023e3f1730e",
+   "d25fb8468a147c6baf3ddf9563fb38617768c44a",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "263ca22b550ccb0801f70adaf244ce43d7ae4a2a",
+   "96cdc93e1ca1bedf270b2350dc9657f9db88aeef",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "e631d7950df5095c50fc0f72434163617094ebea",
+   "f698ba3603c8859412c4db35f777d70631ccab97",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "dd777e20b01cdbd9b7ffd0790afb4b212adafd85",
+   "0bc65f1d001fb7455b85edbcfb0184ad41ef6ce3",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "3666ca93a142f04be29315db7188813fec995272",
+   "c031a4c0d23471d6e0732b868cac0493ecdfba60",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "083863b0823c64782f048964e8653448a722ebc0",
+   "8f40cb489a31428e6ccb73abe5acd845cf725709",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "73e1f65bbaa959ee707cc355c79a392b0eaf3cfd",
+   "af4f0f329009819a6366793e0136c994794e0dae",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "9b8cb3a1d8ef3dbd5f8c9abae4b0551756fce3e8",
+   "4a335ea3f21094b0d969b7578ab1545fae77a918",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "ec76e41ddeb9b970f980186a5c4c188335909e17",
+   "b0bbd0bde31a0559cd71be6a7934fb0306cc0a00",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "7f76db13d2555e8c9acd074e94ff3f17eab03cd7",
+   "9365b2056ccda73a9d44da69982c7b0139ca112d",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "c6dd5590c159557b5750904b52c124ce570b7ea7",
+   "f8f378e955f8cd1084d5b4674f6a7f187fc3d789",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "8ebdfb9f152ac41526a1131e07a9d97f01a14a54",
+   "d1a685be521ba586fd6bb251e19be3a105f832f0",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "793aef76ed981a5d97d20a747087e77eb37dc4ef",
+   "50a5f8e21078b9020576d74ae543c1e4be9c35a1",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "de1463b5d3dbbebd2374028a000bae29b1440a74",
+   "66d64058bdf18129ef96f65477ec7392bf7e4df5",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "5cec2348d225895a6236accd5f70b85707111b7b",
+   "6af2ee1d078cdcbf8bf5b9de3ee9a6ba04a53af9",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "0f5f5353dadb29322360e9c60d4fb339d4468c4c",
+   "1893dfae743ba0abf58a77ae0f99a8f21ad93170",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "67f62b51cfcfe553a5ef1b66e1e70428419c9a4c",
+   "3162697bf32cbb10b931c156bc2f434e6bd620e9",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "0185812ea27f76137150e89d5518b77598b020cf",
+   "c9bb4d2fe73c65fb02756da3eb7411785e876474",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "b13d43aab689847a055da94045f177217db10f62",
+   "da49cf91783c44145f3985771cad84ce76c01b37",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "733dd399da571820380d11ad0961e536faa79df4",
+   "7a6b6abaf7067a00ccdf822aa7259488007734cc",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "966f10b28f10b651a0dff2b6ac38fb029d5370a1",
+   "01a91c0b38a8a62812d2466a89be8cd33f1a1acd",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "3001dbfd9661c71d7a466521ccbbeb6e10778d9c",
+   "245bcdea2f0d1494f49260a7bb6ada4feaf3c735",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "308d22db03b15dd641d52f8dc6d2b0855737cff4",
+   "e428457354efde58387afca279e061f04a6d3802",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "6c5e16e343a494c824d3ffc750f22a4d6be660e6",
+   "90568a2f215716fc503c149d96c5f1fa7ae9704f",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "e5171dacac7f727032e3a9d9bd1a56fc624895af",
+   "6bf526dd44d2f4e34f89f8156be6bce85a21e9f0",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "518fc5ca927bec80e76066f8965da5b82298a4e3",
+   "6a3de7df3869551766dc561e3a73188891e660ac",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "07c8d14f050baeaa6e4297e4efd39369a7e65d39",
+   "787fd136f0ed44a87eb8767778730b03b0f62044",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "307ec94547f90e522ceb1319122285026a334aae",
+   "5412f5c774f46d59f50809eb6fbb098ce67ad69a",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "94a45bbf40d728a0085b21e6f903a16d39b814a6",
+   "7c196b7310dae97d0fb7ed1c36d4f8db13cbc70d",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "ff3a4d5f906e28bbb90fa141461621df1bfdf133",
+   "b65dd714740b6d875b46a59ec715df1fdaef6a10",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "5e202a4c467fb879752e705182ca7c6ee00b3ae5",
+   "8e4e673295cab94fb4b7baf19bf594048bf7c8f5",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "437c1a502c435befdfecf16e259b8a704fd03241",
+   "9e2257546573fcfd5541c622f3452a65eb567553",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "adb575e8fc4f46d50aae107d3430d2770fb3a7ec",
+   "411d6546f60d19af4015bd248e0c5478933ac616",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "b368130fe63e2fde86de17c3666c39286ed4250f",
+   "362bb7300b03b2dcb1670cbcf3885706e9c1f070",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "6be36059447931dc8c0c7973a6ae86f289358e99",
+   "33929b4db8bdfe38bc070fbe64f39f15b3e86f31",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "29a5417f753eac47dd1ae01c661face77aeaec83",
+   "6e348099402ad72b6ae0abd28db109b75decdca9",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "1d19df2c20dbd6e482a10fc8760d819b87677fef",
+   "f9c98e4250943e2cbc836fe1f70a9737878de399",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "29cec56f83e63aac3b4a607361c799ee0b342dbd",
+   "33192628da63968d8bc9c68676f865d09526623a",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "fc158a9c9a53d97edf00ac7cad0524688e6c57a6",
+   "c7b24eadaa59dffa68902346f2093c8662d824f2",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "0636fed23499046f7e05277916f6a21be7b50f37",
+   "a32db59409905380cd579c78d8d3e9d38ff1b3f4",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "6ee44808bf2b9d7b17aa96e98219509c6bcfcc00",
+   "48a05510e8423470e72366e9d67ad47a6c664cac",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "1e97bb824d0e363b60918cf99fa7e8125d91faae",
+   "d9691a5f278e53c0ac3d5a3b3c71ddd7cfa5e3e8",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "bf2a2136ac483a8b034423841395385c8a3a99f3",
+   "112cb07a1c71cf6b2e2016d5dc5967fd068a6447",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "92f584e8be61926c51879bca5fd5abff2b73b199",
+   "c577811769b68b5f64a1e2fd035797a15190db5a",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "3a3d0cb3912b981918db6fbcd835899d6e7ead67",
+   "fc3caa7db410274df9221199ad069a251281d171",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "b1771d766820befe6c6f21b16b4aecd39d2fb5e5",
+   "562b343c0745e2b61af31b1ab6cf59041f684385",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "a2b64ec7a2900ab72d290826da7047ecc5643910",
+   "a5efd1ab5acbd5c16b73bb718efd4988f3d455ed",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "10d67abeb6401abbd3bb046606649e6070e2e551",
+   "5111816d1944bd4939ad5398c84b8cf70c853346",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "c5d55deda1d431df59d874f8f59666342733fcf6",
+   "88a8d6ed0379195201834671498638d011926291",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "8b1c993d2666b8248c6ffdd2d0a592c18f8794a9",
+   "0abbbc31a5521982011d81a3c1381ccb97cd922a",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "e409624d7f9cb5ef6001b29500082963ff3e37bd",
+   "f9bd0ffa568ca9c551fdeed395b9d8df375749c4",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "d968e806708c84fb0bca96a359ea32e21c46b692",
+   "5235d65e67ba3085ef8c39f2679948742d93de41",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "9b6ea47cd8dc9bc7ae6b002c72ddd248761b5291",
+   "ca82f796aa0faa4aea4c23c978c9101adc34251c",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "3a37854f3482f431c3dd591175bcaf5022b8682e",
+   "eb2728ba4a3c52968be22950edcb467a42fcc7e4",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.headers": [
@@ -664577,7 +664579,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "b8bfa369cc0adfc5b773fbfb7d667dec71f2c629",
+   "6db13b83ac646334441a6e37d7dca81e780d0d59",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -664585,7 +664587,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
-   "e7abb5524aff1b3af5c5fafa053172ee72b33f0b",
+   "a775c9291885187a287299ee4b9f45a56833d1b3",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.headers": [
@@ -664593,7 +664595,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "ee0f6a65e9c444efb24c44740f4d4648845abe37",
+   "fa5dd4e3a5fc1ab04ff91d4fcda3a9a61d714dc8",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html.headers": [
@@ -664601,7 +664603,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "6e0f4dd793d482d5cba19ebc2a25fe370001bd46",
+   "ddc087857933116d4e8932aca53fb2c5a9aeac57",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -664609,7 +664611,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "6dcc1de0c4805dbd3034709490148c94a3b7cfda",
+   "ef1e1e1c630eb6f6763914fc699d570075fcee46",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html.headers": [
@@ -664617,7 +664619,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "dd867e250bf716b81005e6f65a799cc4cc3d3fc3",
+   "4404426bc7ec6b33464faff2cff78e8bc54d8703",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
@@ -664625,7 +664627,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "a8a664fab21d0526cf86483d783aa9c6d8765f18",
+   "7bac59bc7503eb06961f85a1b13a384945d9bcf1",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -664633,7 +664635,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "778eace945616a53842e6830ec755ab55ab99a74",
+   "acbed1072d54df57b20f3098ce93442d9c37cf55",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.headers": [
@@ -664641,7 +664643,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "151cdf90d97028db92726fb038c10e11023dbf62",
+   "c6cf50265cb2d82a8c418820eab8c8a90462c5bd",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
@@ -664649,7 +664651,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "8356d3b1842a43905c5737460161af1aafa23545",
+   "de2b97f326738f27e43a2f6d5fe6af43ac7a2326",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -664657,7 +664659,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "be8889a926424964558d828bbc6311d29527d71a",
+   "51e66f2a9b24fc2fb6dac1361e3f00ae31b34a2d",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html.headers": [
@@ -664665,7 +664667,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "f579e962710a103fb2e9368be6eaf6c26163ba67",
+   "36161da8f3b6d3f739d9916cc918266d0d1d1d0e",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
@@ -664673,7 +664675,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "6771dfdc2cd4db3aa8c0f0f2e8d65edbcd2c1dd8",
+   "a11910b00b82857a0ec61b9246025bb442c156db",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -664681,7 +664683,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
-   "82b6165bee1750f9acbc27e97ac9aee8afa7aafd",
+   "9ba64a59d56111f6b88a7adb56a064d292d142c5",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html.headers": [
@@ -664689,7 +664691,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "850b62b059540ef649d2c9c7caaa65505f043ff2",
+   "af71a3151103787ada45885f075194ebb6076919",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html.headers": [
@@ -664697,7 +664699,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "112efd4056cdd34255ca1ea71aa7b29c74daf72a",
+   "83bb4f5aa6f385bce2ef3da96e94fcbd6a055024",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -664705,7 +664707,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "8dd238f17810fe9b1c800b663a2fc5fb5bf31c6f",
+   "8d8435e45386f7e3d95a75040454914cb04ba780",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -664713,7 +664715,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "d0c92c8c333852a82528ad6c614b36fe7ed41cda",
+   "2d324453c557be5d937b94a963043f7e11aea3da",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.headers": [
@@ -664721,7 +664723,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "80aba4f30ea6de92c71977394821791ae62eda55",
+   "88065cd16cd8896a678c5b5f732238a191964a34",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -664729,7 +664731,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "76edcef00e158c0828147b954ef2e09113669357",
+   "d979933fac7f3a891792c218142bb0d8ea532b22",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -664737,7 +664739,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "0c9a64d75bfb072c54247e1e8393ca477cc4cc96",
+   "f53a953aa7ef2de4e762926545c1378d1c668ea6",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -664745,7 +664747,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "7261e079b5292d838bbe8ac021c69014ac20d02b",
+   "67600bf977510b56faf394bc97b7b22af0b65b59",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -664753,7 +664755,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "e3d99ada9946e7d4a714dfaff2a9a5dc67c8002f",
+   "e27563a442134909fb3e6540542b4804e6205091",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -664761,7 +664763,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "bf4f76c422c7e7d6631584d5a1d23f323516bcbc",
+   "282de2a68e1e5c26adba038a49836b3e620338c7",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -664769,7 +664771,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "3568a5853db662b6c90bd0c29a0b736cb97ef619",
+   "afe01d98b43cfa7be9319ab7efb1add237d2addb",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -664777,7 +664779,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "34678b6e0bb2c5ff7a45c972bc41923540c276a8",
+   "c385eeb8cb60118bbf9e0dc56181f05530d61e89",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -664785,7 +664787,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "fd6fa84b8fc30fe4319d3d138eb26f6677911c8d",
+   "d3b18a67385f005d916584f8e140cd6b22a78208",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -664793,7 +664795,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "8e2f26110c38d3936775e52703cca4c8e3079e1b",
+   "ae435dedf3e63ae2c404f5788b9bd6a27957d623",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -664801,7 +664803,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "f1ef4905ab9197035cb27a8a38c03f6900365533",
+   "ac8edef816311c15d723a164c32b426d005cb900",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -664809,7 +664811,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "882ec58e84c4a39ea7396cf76f7feac6ba67e285",
+   "5288baf690b541cf773dfe2b8e1e35c0fa2d512a",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers": [
@@ -664817,7 +664819,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "61222c061b1a4966f6a5250d84b5d207a7e093c2",
+   "76a320a9bfe653066f2a794d2dd462c840bc9fa4",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -664825,7 +664827,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "eced7c919476afbd6570b0ee749c7ece75ddcd3f",
+   "bd748b6d848d0f331069e9d6c35ba39e9ff0d078",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.headers": [
@@ -664833,7 +664835,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "07324af6df4221055ed8d82dee07e46c7f9bff21",
+   "428ff86154828309c0fbdc9baea0e97fb9dadd40",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -664841,7 +664843,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
-   "74f5a7ccc92b3fcc45573f897d11cfc1eef9f94a",
+   "6669ab212b34276a29fd3daa31aa75cf71f85c51",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.headers": [
@@ -664849,7 +664851,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "e0c913583e9513f73303f90b05a94898ee668bb8",
+   "c35d7cb17bd723a584bbaab99a10a72d153bf885",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html.headers": [
@@ -664857,7 +664859,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "28616e8af6f01c34bf833b9dc21ec4e1e4581a5d",
+   "01ba2d5b0bb8e78beca20798e615c5d53b618364",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -664865,7 +664867,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "4fb70527b619e5050362d358edd2169e37551462",
+   "8fb9370cb754b58bdab903fec39d7172add83b91",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html.headers": [
@@ -664873,7 +664875,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "dc4f644b7837e39a92f59985876e2611d1fbbabb",
+   "de6638c6d18ebc522104f62faf76c2becc378b83",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
@@ -664881,7 +664883,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "829b2b072f74600a43900afdc83b245d9dcc5547",
+   "ac920cb9f4f28bd08d75636187a62dc7acfa4298",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -664889,7 +664891,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "e2be71dd9ce7931e74aaeb2f79636af14f1fb16c",
+   "a6eedfd236c7e28dbf7f26b065fd7aa3fec3e8f0",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.headers": [
@@ -664897,7 +664899,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "b3d3dc54a0d29baa257e347bde911e839b5a84f8",
+   "e0e92bf589ef0f227510313d603c2ad8771db5b5",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
@@ -664905,7 +664907,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html": [
-   "82b67545c48b83ef16fbad140020ac89513b91fe",
+   "4586fab184acaab226c1e91ea417344c3f1454f5",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -664913,7 +664915,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html": [
-   "bb8d797d0cb21555280f569442230882ff3898e2",
+   "9e0900d7f25f29e5ed4a66d072cc184e2b06d193",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html.headers": [
@@ -664921,7 +664923,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "56fdc7923fd4fe507f9ddaf81da6f56b20f4210a",
+   "d8edc558d40330ff4276e5f0ffdc5ea7b27e20d6",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -664929,7 +664931,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "62397c2484769028fe30f1599e59e62e55c190e7",
+   "b68fabfb9d9671673114cd1723a220780ce2c33b",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html.headers": [
@@ -664937,7 +664939,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "183620ee89bbb3d0e4dad7c1dca1fd0bbadf4ea4",
+   "c9623dc3be4279282d1a7e1a476983ccdadbc7dc",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
@@ -664945,7 +664947,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html": [
-   "1be3aa77d065d6697f22fe8d6e74928f9846c79d",
+   "705a94f449f23f0e7f63ec50d4857ff0cb448d44",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -664953,7 +664955,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html": [
-   "ea834022713c137d9ef6bb52aa988333dc236332",
+   "e751a96832e019d9aa1f692f94036363a08f974f",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html.headers": [
@@ -664961,7 +664963,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "1b30f714d08d52c368c6a8c5d92ca4a44d733759",
+   "ee798fd77f6e3069609a1a7cdc92ff6bf8980312",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -664969,7 +664971,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html": [
-   "b5880bda93aa4feeb1b317bab90279cf7b5b2e7a",
+   "86290413695026f37917927d45f3a3a52bb3e610",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html.headers": [
@@ -664977,7 +664979,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "dce61d41d78df7d8f7ceb4dbfe89886fe81c4ad9",
+   "34909cb71a1eaed38677ce4d44ab7000094febb3",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -664985,7 +664987,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
-   "c857f4c7695a7d4f38fd531e08001dfe8f9787f8",
+   "8baf9eec6861ae512fd9ff917920189fdeb37702",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html.headers": [
@@ -664993,7 +664995,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "1f137283c6296eee6d871f854487681b300d4917",
+   "3462a51251b16b98003e37d930c7420abcfade5f",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html.headers": [
@@ -665001,7 +665003,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "b25470749eb5b348677bf86714825d5cbffcecf7",
+   "3dc212e9fec974ae2f0b9d73105dc57e52d2a4c3",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -665009,7 +665011,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "4a82c29445269796fc424e176c08221c8e97d4d1",
+   "c25f716b03218357c4379c6978b30b55e16ec6a2",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -665017,7 +665019,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "787d3afc7a52765493b16297763d10a70de587b4",
+   "ca6b4320645d51b3839d5006c27f02b5eb314b95",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.headers": [
@@ -665025,7 +665027,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "0a1d40c5f876293f699b523a7414cb17896c5642",
+   "a22890c0756e1a78a625cfb351f03c6e14773dbe",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -665033,7 +665035,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "999c43e8b1d29499fec642d08da3e99f73586302",
+   "5592f7a47a30f5a4f59ca83e6faabbe5d1a12c2e",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -665041,7 +665043,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "6330560d94641038191f02870182984cdb8ac2e3",
+   "af5b5b495c62348ac91b1626efc8717318c4fe32",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -665049,7 +665051,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "4681722ab1776d1aa363c03b110c3737dd4a16e6",
+   "ac79d620e75f8c0f7e20f05d3c2cfdfc48357b1d",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -665057,7 +665059,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "1487f9645366c7c12d093c898dc50ddee730b9ff",
+   "d3bd99156f17dfc03171c69babee05108ef2c5e9",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -665065,7 +665067,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "ddd876b91afa03047a6445773d94e6039161b5c3",
+   "3aa49c4d9b8cec26c9240493fe5146a29142d394",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -665073,7 +665075,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "6c92b8d5166606991859dcd559a940c2ecf8d8c1",
+   "dde11eb542c95b0acbcf67f1bcc6d5a42c82b56e",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -665081,7 +665083,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "c2fef2eab9c6c7f080d6091077ddc621e3145973",
+   "b6be0bca28c0025408b01999a42b0a3117939de2",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -665089,7 +665091,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "51b0a806941ec067b7c2335903d0ec8e412f5527",
+   "face97dda015b5f61513846178195c91f03ff3b9",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -665097,7 +665099,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "ab62bdbeed56c66e10faa20a6ef3f19d96e73601",
+   "32123fac2554cb7906465d1e95830811dbe431ec",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -665105,7 +665107,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "bd5bbed36eb03f860e556836d388218f6219c409",
+   "8efd849727dcb090097789c1323df6199e342dcd",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -665113,7 +665115,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "a3d7e8477591b3bd5b7cdaee48ecf1a33af884a7",
+   "961cb2b4a946b4738f28124bb65c9bc5eaee3e02",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers": [
@@ -665121,7 +665123,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "e264bc35cdcf80b01e07463ccf4a3a6a8333fb43",
+   "5f0a33f4c242c8c593c897e8109456c226063b24",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -665129,447 +665131,447 @@
    "support"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "bdfe9f7b932f1b824a74889309d84309d7de4eac",
+   "8bece44d3edfdf284e8373881ce25608142b7d39",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "96cb246045917c8cbe541761287b4fbe082a653e",
+   "02c0d382c8deee2206fc6c37866c73b70d691921",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
-   "97b2f49424eb9457d912c53b00add8f6b987f7ec",
+   "2167cd19befaeafc052336966f3d8fe62079eade",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "41c90bdfd053611c7f7bdc6cf5391cdce8ddeabe",
+   "464d38106caf4b54fadb48de1b8c655434c47332",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "005b0fa5eb733e1e589c39a5f93192a52b093116",
+   "6bddb18878efeb0fe0d30d321ea75bbc4c782c4c",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "bb240bee618e9c58138335cc93fd63b06b4d9d4a",
+   "076e51049ad73892ba2fe346cbac312e7447128e",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "0d6b7b272181465a39f41f9bff6a56b7286d105c",
+   "8e9b6554fd150d8bf3f3608efde52cf0dac62dc1",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "09d9594c266b3cf23e67f82d7c13228d279d3524",
+   "d78d22da6015be6471c9dc6f8948961e6b95fb36",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "c83cd66182d20149cbe5d1b4d626166666a9ff1f",
+   "ca2079d40209bf36f621d72cd237b586df71c928",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "d9ed4f6c0d2ca500fff0b5317895079bf479cd9c",
+   "5d9aa9a967c483b64d9ee84521882f9aa957ec89",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "f060d3b999923a731bf35e1becc94875c1547726",
+   "1eba7c478acf9a9e41f99c9cb0a2490dd30973ed",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "d37724e7c61c984cf28e4d57eab3811dbcff9d77",
+   "090d71774683926e6c3776b27d4e1153ca1d7a91",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "7c9c53f86f73132ee8c9106400c2185cb973be92",
+   "6f8a8d1229175ea49ae00a2cead086a175164fe4",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "2b04c50a42502e36b316900c6f156ccde3206829",
+   "68836a1e20f8b2a44b3c4eed94de5808042db74d",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
-   "064da1b6986e490c21689b8471e87f7281a61ca3",
+   "de67eb3147c6050ad96c646863c81141a60b609c",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "7046e6e1474c98f8e4f738dff549cee9c5c77dc2",
+   "f29a3130e4f518b4dd33f4711ca4dd72503c410a",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "a14d6f79ced35198baad0b2c585c3c49d04a4d2b",
+   "85ffd5a6205bf0b39f21b370467f3126717245e5",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "25557dfb8e7e851da6f7b680265b5bd522edad0c",
+   "66c4ed68e7d84973144ecde117cce05b1a534a81",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "f3ce31c69db6262d63e8c47e10e60e5f4f32bc66",
+   "6539ce8496df18321518f05af0238958c12bcf6b",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "fdbf7a78b19a9c6d37ca000a15de6df190deabc0",
+   "4588734ecf6eba6b84739cdfc52f40c4059b3917",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "cf16f8adef64780c276f05e9908c38562649dde7",
+   "9b86f363499a042668b4e9bfa9297e5f43aa09f7",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "ffda52304cd913aa4465b43919efa1d3b9829e07",
+   "7271188681befd4b486e8afb477f0340bb92bb66",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "e013b680fef2fd42cd8be228aceed2e9d07167e2",
+   "c26d30017f961957346cd66d60150475fd7f4673",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "1a1b2404463e5e47c4f0a91069d9b93e1f51c8ee",
+   "70c9c8160bb50fe43dce12a72f1cf9b8ba22f87e",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "5bfd8faa1d90d9ff203237c8e5b2da0feae79e09",
+   "1171eaff9075cfd0fd86d8181c58040eff00ecdb",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "d648738223cc78e63696fcaf03af5250865c0795",
+   "3f958fb4ae82fa2c971c3f3dc189066edc640637",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "25f01ca1b264ecab6d45b244ebabccce5e6344d8",
+   "c37487a8177236a414dd69ab94063ecb1094af4e",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "c51a797d372e4cda2fd1285796a46461cf721c1a",
+   "f7aeb60176f36f04cfa207df36b42c9394583097",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "3562c938a091c9df126de4a718fa94f676e69f60",
+   "d3696d838659c12e28486b6fa578bbff80721c00",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "50994e295cdb2e8fccea0d586891c20cd81c1747",
+   "f6b60e3e3b422b94927b2d2e30f53ba60aa2ce8a",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "da91cfdd2ef82e05d2aca4f9be24b3d65584a4df",
+   "d696ac799378fa4a3f0c43bb1a387e4e8b92039a",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "bb496aa3f04ad58e015b2541a6b9b7dd44f82416",
+   "3e2328303efefa2d41e13889965ba2d6ac483f35",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "32ceeff6b39ee782d65ff5773daf974c11089d02",
+   "7730443312c73e8deab1230fcefee748cf77ac5b",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "0179180e5895fa9e6552227be5f897ece78b927a",
+   "cec306036efeb6b418d154e9479554f6aa6f8136",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
-   "3b9d5beb6a39d046d68ee54bd685de9c02eabeae",
+   "479d8c56ecb6b375c35653f84cd7b72055fa5b4e",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "01c5646b14c88d1a3fd80bcefaaf90bfec9ab6b8",
+   "b551580619c3e00261f7a68d905da1899ce8d61f",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "fccec81bbcc4f644782a312850d07b6f19c37d36",
+   "b1d9cad4e67f31b5a24ae4cdc11b1c328819d2fb",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "5840859b4ef9c3a4f3b9b37da02f6f5651614132",
+   "337b2ee3f6bec996fd081cea2bd0f404176f426b",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "4e93fafee0562bbf77425c3e853d1a6792831926",
+   "47e90041bdc05ae9d13f52da6ed1d96cc686a523",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "9a9490e666f85ac00279f786b65f919332243baa",
+   "2199f7a899f99aaa74da077137ed4c353344a9a0",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "9e1bd3a1c08477b09cec8bf022ce785befd8880c",
+   "2657884e93eea1638b3e3edb54e339243ad3da36",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "46a7a33c3ff1bf81d4bc97e1e9fa1ee3c496397d",
+   "40c7e03703416f820576219ce418777a64382b49",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html": [
-   "f60cef60c73b7d6abce9d6474a11928f2b2202c7",
+   "85886baeb2c4a9050455c659691b76d6bd3fad1b",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html": [
-   "3ee6b651a90dfcc0356fb8db435a04cad7a46c89",
+   "9763a1973aed6c2c9b3c745a65cd3ee1438c7ab4",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "6186d57f3f85397c8a057a71ca1769b54aadcfd8",
+   "ecbf2b83c288089acc3e2b57bbf3c604f9f1ca52",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "08a6df4fdb41ae5c4e09b2d63f163aa13bcc2f9d",
+   "c0f5c866b502bf6ecd95d204e9350ce3706e29c7",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "8bf116b873f45fbdfb8d5b81c61d7c6c24a4dedd",
+   "e747f570bfef40e0b6aff19869ebcbaadfe41028",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html": [
-   "aa874fda92229898498764e80416c4d852c791d3",
+   "7fd8ff4d1943e6e63a0897adeec339f8ede0d14f",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html": [
-   "056494df00baded9cecc24668dc3124e3e6cdbd4",
+   "beec47c1edd70dd0f3f7e167d82f8106918464e1",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "7d18b730ec3fc8dcd165afe86660efda1c9faa50",
+   "c4070eca035e10d71f0e4204163bd85193461da8",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html": [
-   "8a85ecfc756219aeaa8e396e5daacf06494a40e4",
+   "e5ec2f3a1b1f113f4b2b9213257cf910efde07da",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "3fe96e71d48661802a5db3e40f7854b8bc7fe77d",
+   "0383a617eaa874ecf736550e12f94a7ac67fae4a",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
-   "bdfce453e8db50ca340dc704a5c3f19a0653d062",
+   "7ce14526dedb9ab3ad57d70820fdcc1305c19da7",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "6e29cc16ad1ba760364310def23132f3e3cd9338",
+   "d6131965f7ebe0a6c7b9a8d034e3a5f977c8e048",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "8f4342bcdbb5caf00400e621bdd83f7b42fa670c",
+   "752a2bb083222ed4c0be5bbd8e70cd79de9cf4d6",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "dfc4b9792ab33f87c0a9ef5cb1de2d04ffc22a0f",
+   "489181e7a6c34902b35fd3f46fbcf40dac7d9958",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "dfbc93f207678fd8d6a327a1b8ba5900197e9a5a",
+   "e3a255bc3533da2c65dc5737caceb17b6e40dbe1",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "4f581e783486c5fd47a7c21a3f4dd081dcf1eb61",
+   "b2c688bd1e142a7c273ebf3167d244911dbae053",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "610799d5e236b1bd547e405fc78031e81ea687e2",
+   "1677fde7fe7fc32bba41503cfd8f2ab1a7c599fa",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "db36bbc70d83fdeb3f26c671586c0d39e28b7ff9",
+   "995c0e605acc6465c78c2c09fb37b13c490b9642",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "8f4eabfa254441ac00f7dbde326983dceb0c5584",
+   "31f622b9b4ab016e0c0ac9b490645956449dc6c5",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "e5acfb1b05096166b9f17fef82477a35eadceb9f",
+   "d5a472e0ffa5100b1051efab9bde244331c0f43b",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "f2a6afb83f7e0224b47de91314168604038a6c97",
+   "86665bc952935c2174fcb5a29fda61262b19a8d9",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "40dc6bfa4078c241eb0e3c8c84f5547dc9a441c9",
+   "caff3743136c8c92efa5ca09629285eb430ae5c2",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "2bac0fc5a3d81da183c296b90a935536b5b4af6d",
+   "2f14b230b33317af2782f758911fe048843daf2a",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "023680ab7e16fbe8d68d263d0484a8f77ba9d5f3",
+   "6205355dfadbbbd6170c0c20576c4900c5418a35",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "fbd9be455de2cb64a707223c91e57545ad6174d4",
+   "d061c5f7e9ddb86b77bc6779e54251c63291bf80",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "1b2a3b3ceb4f9ce975d383405b682d0a74b37ac1",
+   "6066601fb0f07a22cb1e60f824363aa4f5de5020",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "0c002eff6aa5b60c2b2d821af8d3f1417653f3ad",
+   "597c0a51676e159ef77bc1cac674aec1a4b83c68",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "3aecaf52f88276ac210541d5f366b4d3ee96d6b8",
+   "1cbc16515d17490c4abca3efca4bbf69d6ac4b34",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "b803ec86857926b42899eeed6b1b12d81feac5e8",
+   "cefaa9c97f7b256083ca3ced1bcc23cef95d3630",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "1d4be3c779501de6771c3462da8800c36cbdb684",
+   "bd43802283c5cbd3b41938af7323559bd4190bba",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "7151507702602c2fe5472ac8fb1072052a656a9d",
+   "9503d148222071462c63a1d1e3afd2beb0f189e1",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "814b6d9ba1ec2de8830dd51d75ed3c766289ce10",
+   "bce63cdb6d392d1c6cf0001cb60604f584b470ac",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "3bb8712035bc418e1d01e20c94882767a96b43fa",
+   "a57959714e9b4daba20e52eca33b3431d15659bb",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "8a8a459f9447b7396016a607db4e0c77d74a2315",
+   "9e292c97c0df0a98d0946cbb003969dff43dcec6",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "04ae66bd22c43249b26be174014eec261e69660a",
+   "1fa9bf44245ba3ccd19e7db5a848939636b0e52f",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "edfdd5a4fb4729b3865fb6920f700533088d35a1",
+   "070e99e8f18e7a1c6899ad63b096c28f8cb3dc0b",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "19bb2541bd31c383ad3fc99014af20ceb9c7dc26",
+   "980678e8168175874a7fcdba0cf0c7d4011f97eb",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "45216007e36eb0437ac0a416bbf36dc049ebb8ea",
+   "982a571ab1537378a97df8f7a22c93ac96d36946",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "0ae15d3a6f5477b257b5f9c0177f287234def1d5",
+   "7e9c9f1e7b89ca8a629d1cce938af5c6df58f944",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "4947e50aab9cd219bebad1af8796c329775020c7",
+   "639c2ad1cf31d85fc93ccc398b330b8757fde8fa",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "39deeac307ecf4cd836e3f86d09d97be0aaecb82",
+   "9bd40a44a819b51ee5455f7210b81012b1bb8d98",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "334ebae52279db78a98b10c5d45a588ae5634eeb",
+   "e2b981ef3206d6795cf6a08d302e061268537d3d",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "ca1f0a68f7a7cf9c20b8d366f48096f75f5c48f9",
+   "8bab7df57a8e9dc5540302a797bbc0377a8b66e5",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "f813f24a611d6ac8579d9d1b7bfd1bdcc83356a2",
+   "c2d2948d4b77ffeb8a9d6018d606f21df1ec135b",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "d3272c43508c8b70922f18dfbac9dea283cad49a",
+   "f1804350ceb209b4d23c75295f5ad3a488a7848b",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "9c4d68109b901e9d375b7c381b30b8ab05f28e36",
+   "fb1c255cabd056cc7474058938e1e7317f199f24",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "2c445f1689271f367a663fdabc7dd4b95cf60b24",
+   "bde470822dd5c5168c67c5cbbb75cbbe5780813b",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "384d6b4f05c509dc25d3072ea0f5dd9526c8cbe0",
+   "e28d725eff819b77c7c7680717f022db34d3470b",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "f1d51bf377deb51abc659e6cdfbdde6640f8f5e5",
+   "699a9f8f4220526981143035eaa1fa19d012ab21",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "22800cf4b4d9a8b296eac415d070ba47a4dbbbe2",
+   "241f87c0769abf2b452af978fb5497b019eb2047",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "ceaa0164ef2db322557d758b767fe8c8c0bc3867",
+   "e9c5fc2a0bf50957f4d7c76fa60cad278a557ede",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "5117c0f4dc149ab30df4351ba8bf7595967fa6b6",
+   "2b77f9761e70ce614c119fc88ac00e2d568f6bc2",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "d891987d39fb7f9cbbfe2218c38e40cf8403e509",
+   "089c3c59254dc684b73501ef0382a998c78daf7e",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "246089208a1d1ddd4cbcfeb4e304059c48b8e3a4",
+   "f152defa15f871ca96f6a7adbbf526e327c84e79",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "10fc2a00fafb1854ee7fdc13e62dc660ef09fcfa",
+   "6be7be59f2e996a1d91d9be726370f181b874574",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "3fae7fde3c206677acdeaa191fd9c91464eb2f92",
+   "1d234b8d14ddfce8b0f6aa18cfb1cd11c062b1ec",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "6ad3c317b112d73aaac2bbdb176ef9ececa8f266",
+   "fff0f8ba92e0796e20a5c31dc342df62c3b6c040",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "5976b8fc94a4b4c2d4c341689b08ad476ad6ae6f",
+   "9adae7ad86e4d50e7bb89011db287dae290ecd5f",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "3a4c60248c86a5ee54a5d2fc047c9f22ea4785f3",
+   "5a74b6f4ccfa7655a119db3c77fe4cdd19fa050c",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "9d504a970924566366e0fdbea52ee262f86c8e83",
+   "256ffe7733e65e9be8eea06a3dbaf91d3e0646c4",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "5fc928a3c7ece97db3c0245996dd6c772780c868",
+   "7875fa93b9e5a073d029d2e1df0295046a7678d3",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "01d2abbb84cfadcb871f799a0f7f077fe081787a",
+   "c611592345158477a476168869d36ad1a4b5aa42",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "2b520ff43afa52de106e5c4b6ebdaa92603606c7",
+   "2705d9d7ede711646396eaec4c8aa1f06f2c759e",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "7a2fb09fc67e4b7b40c6a11910aab7b117b4cefa",
+   "2edd407c673c7eaf6c9f035cc290466a0d40aaf7",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "7612d5ef648315922ea6062bb1201a8494e42884",
+   "bed4da153fe4488d76976dfaa0a828f0e19fd63d",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "61716199e5843855779b0c5f6db19e784e723479",
+   "e3baa436370cb28ad15db85a2a84fca13d19270e",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "7c900a7466e264c178010df39da21cde1c2f7ae2",
+   "d4eefd637473af9abca2d1f251562b24e6e24336",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "4b307df8c3403789043057e7d07fdb4bbfaec955",
+   "60917b64e8e4a3803e4e976cc16cdaeb688477e6",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "3aabb1d6e6b014ca8ad534db3b024b0b279647ee",
+   "30b4a2439faf2ccdcadc224ad2b5e3d4eb302d40",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html.headers": [
@@ -665577,7 +665579,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
-   "53ab93a35745f96d6bbc65d89ac3fdefee7c2e43",
+   "78f5cbfa1cb62ecca5bb2d295d96f7dd38c05249",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers": [
@@ -665585,7 +665587,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html": [
-   "ae0a512baaee29771153cff78c690e007cbf26bd",
+   "efd83b24093f1eae6aae08e22ffb252ec4dbf4d2",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html.headers": [
@@ -665593,7 +665595,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
-   "1360c04c3fbd5300ffee2a3947a4ce90bf9b4f7d",
+   "aee2c19a06881969a9510c1822fb03fe910e2721",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers": [
@@ -665601,7 +665603,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "e608f52cbb532bec83864cecc79d622de7c1fcab",
+   "0bdbad44abfdfe1624ded6c2485ac98e3880d769",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -665609,7 +665611,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "e8b1059951d083e035add7fa6f76edbbe332299c",
+   "cc62ce4089469a3cb78a9a23206efe7f9a0d0e82",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers": [
@@ -665617,7 +665619,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "0755eaf96b55e7871cffcc439b1da8d48f635e3e",
+   "44308b95416915a81f5e689a8f9f8ed73c8fece2",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -665625,7 +665627,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "6c873e8f0ad09e2ae41c5aa13878273ffedb45a4",
+   "34fa48f5e7b4d6c23c09242d5db2fc917b9d54e3",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -665633,7 +665635,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "e9d9d246902cd47b046eeb37440c288217c4e131",
+   "a525fc603d8892cc31028c3d620ae512f4b32643",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html.headers": [
@@ -665641,7 +665643,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "78b871570eaf668851b040c2c839c3f7e72bf83d",
+   "7ac73e2015d8400b9ea1fd995446596ccca064f0",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -665649,7 +665651,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "a38b20f1753ac48df1df710118c710f5c8940a44",
+   "f213cd31bf002df3922d3a6eca01fdece12ae06d",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -665657,7 +665659,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "a7fd03c43015ce6f25f635839c1414c19a293c24",
+   "8140af2fdf9747e55fbd879796b6e4fc58a4a6c6",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html.headers": [
@@ -665665,7 +665667,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "06b2b252f3514f111db1ec97c9c68b89d3da3bae",
+   "8e8241e6f810e86a99f22d02912e3e28624c155b",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -665673,7 +665675,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
-   "49c3ec58e8f05d9bb1b4a1b60271423e9f4b480c",
+   "f8f932883587b05769849e14219397ea47e36cbd",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers": [
@@ -665681,7 +665683,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html": [
-   "163b8c8a038dc813962aa9833e9c7f0efd383199",
+   "dc670ca1ad2d1771426210cde4466e1ed6eea91b",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html.headers": [
@@ -665689,7 +665691,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
-   "c28550135119c31f446dffcfe655c4280b545852",
+   "b10e0f2958d08aa96099c899d0de59cc637e05e9",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers": [
@@ -665697,7 +665699,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "2ce057e691a64899c4bbd913858d23ca91ca31dd",
+   "ed9b5c0089dd2e40d203453ddda8bf03d83bff69",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html.headers": [
@@ -665705,7 +665707,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
-   "608035538d8ed0bc3c138d75137919af9a4752cd",
+   "3adc05493c586f5d978b559e9bb07f734d9c95f1",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers": [
@@ -665713,7 +665715,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html": [
-   "046b2585986cbb57276adc3f2442e0f3453c7448",
+   "9a64304c2e0a8f61521bc36e22af0b0b5c29473f",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html.headers": [
@@ -665721,7 +665723,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
-   "59bf756b8eca19a40f2c4ac2ca84adf1b8825c4a",
+   "03a51f774791d9722a27d53ad0675a41e5a7ee44",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers": [
@@ -665729,7 +665731,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "eee0a3f8ba5fd5c8982f4883ed7dccf9bcdf5530",
+   "ab4c34366f3becc4851a8d832a1c4e47f76b5fc3",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -665737,7 +665739,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "57f1a9d0407755373189253d6d4344589b27ebd2",
+   "db547eca9708064e8172e54b7b817a196c7664e0",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers": [
@@ -665745,7 +665747,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "fdb7033c4c42c61cf930fcc723e3cea5a0a4e314",
+   "931895b1d4fd08f776476b49868f8a84959d4b47",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -665753,7 +665755,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "7168479ac2df5fa6c79ad01fab8943b8c52e9e05",
+   "0ef325faa851d12bbbd296bedff2644fe22a39e1",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -665761,7 +665763,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "5689889eb33b47c6f0ab813bcb39239d607a4945",
+   "69909e9ef80c6f98cf54911ac68f79dbea22cf07",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html.headers": [
@@ -665769,7 +665771,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "678d95524020fabd6294d8e9aee43800d1c71264",
+   "35115b87c2bf76b0297e5cf0185db8488e8d1f30",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -665777,7 +665779,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "73cabcfd93920510eed0b85954c3978100fba7c5",
+   "b95663578562c1566f9a4a7f90a4182005ece17c",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -665785,7 +665787,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "fccf299678c42caa8f96f48396dce5b5b34f2f16",
+   "1220a18baa636945c72fd9527e541085b38aa277",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html.headers": [
@@ -665793,7 +665795,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "174c0feac7426159f3d4de417602188fdb97c857",
+   "21df7bc75d4612a61a69d8dfb32a5b0d1516cbfe",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -665801,7 +665803,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
-   "832ceb02ead4556d018fc956c1348f104317520a",
+   "144c8bf13430c65369c735e8d105dd13b0648b3c",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers": [
@@ -665809,7 +665811,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html": [
-   "4ce7799350541bdeaa2e2d02ed99690462605260",
+   "46086730a0087459685ebf8ae10bd98e4d12a982",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html.headers": [
@@ -665817,7 +665819,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
-   "664cb7e3deaa02bddb63a10b207abc98aee0ba99",
+   "96faa625202026279c9ea60d59d3673031b97798",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers": [
@@ -665825,7 +665827,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "2041b85a8e5a28a6f06b9550b5a17e4e4f2086c6",
+   "5e5c5f8200f254a1d9208d9a08cc2c607b3e0748",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html.headers": [
@@ -665833,7 +665835,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
-   "2ce45af4cdd0c8e1b30e6b08a3e50d34bbd0460f",
+   "d82278a75d5694268bb8f784aaa5c20e5e39804f",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers": [
@@ -665841,7 +665843,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html": [
-   "038a0b2dd5c04b1fa1491a27000eead5151eb052",
+   "928dcce4ca57bee359c97af68034e962f2c50d3a",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html.headers": [
@@ -665849,7 +665851,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
-   "78b340afe47a05e44efe7fdb4db41363138afc1d",
+   "f4a83144a42dbfc8a32e69bf2506cc42d0a93c01",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers": [
@@ -665857,7 +665859,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "12446ba148376d20af3a30ebdd079e5e89e4140d",
+   "6fc3d5945454e95086d7a135a1637fccf99cdeb0",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -665865,7 +665867,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "70a115d87566275b679cdfeb49e7a70366f6c6cf",
+   "e9fff3e4c85974dda9dac683ce03ecc2c73ce6bb",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers": [
@@ -665873,7 +665875,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "7a083ea6cdc49efdeedddf677718aa788aa8f456",
+   "d6b38a0c6349415dde4261199086fd3b9989f314",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -665881,7 +665883,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "12871fac6bff1c9ad2a7e451725a7653e147e08c",
+   "c399b47983478ef6728adbeb1d62e3190e1ce917",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -665889,7 +665891,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "abd803c443778f324f03663de5474a7b3111f814",
+   "93d63b6c2efdb1c79a7427cd9d21eac5b58bd12e",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html.headers": [
@@ -665897,7 +665899,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "02e9b92a215ee266f5a03deb98e5e5139fdee431",
+   "5e7717967d88fc9339b3ddce1dfa25d60a9810f7",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -665905,7 +665907,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html": [
-   "8d97cd77bfd1b348322f9bd5e21c26bc005d9833",
+   "7b67fec5f17571e11d18602c2f1cd76e251c4683",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html.headers": [
@@ -665913,7 +665915,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html": [
-   "a3291b0ca86e9595880c80032db774885d2f0cbe",
+   "d8ced7706afc004f6ba760536c27e24567049b29",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html.headers": [
@@ -665921,7 +665923,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "435281a74c99e98b5e4ec8143cd6d7c82f7dc269",
+   "e315f3cc216e2a0faa697707aace923b2c0f6fbc",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -665929,7 +665931,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "dbdf2d6fb9ec8181dd41ec9e9f56a4be1fdde770",
+   "fa86de29f5a202649bbe3a08bdd3a7e334b9bfd2",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html.headers": [
@@ -665937,7 +665939,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "e1643fd37fad958655599429da21bb636b80bf71",
+   "c7ee265f11f7122566f4e957e01c5684516a513d",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -665945,7 +665947,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html": [
-   "53cfed58c20a08d8d1fb375b5dd45c35da96230c",
+   "86ce965807faea6206e52fa0f77b31a0d1730ca3",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html.headers": [
@@ -665953,7 +665955,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html": [
-   "4621243bb65a04bc04e4a04b0b805757adbbb7f9",
+   "a0a3492f10dd251f14b86a7845c41486f5d65d53",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html.headers": [
@@ -665961,7 +665963,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html": [
-   "7882c1319c11d2cee81787d1d9b86cbe2294d1f9",
+   "ff29153c8c764bf90de6d016a784f2014690b24a",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html.headers": [
@@ -665969,7 +665971,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html": [
-   "f9baeba7a310229796edd11d0f5f06b83f5385a8",
+   "ba0c3a2cf3983e78c2908c2812869ca427b9bf25",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html.headers": [
@@ -665977,7 +665979,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
-   "89acf024fda62172f8cef7477ae38143e13fc799",
+   "67f6ce8b96c1f44396464ff6a02afa6f1200a565",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers": [
@@ -665985,7 +665987,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html": [
-   "9f43191303cbbccbd8220ad156a20a097e279e57",
+   "c1892cbd682d6fefd407b655c4718a8c7cbb5066",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html.headers": [
@@ -665993,7 +665995,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
-   "5e492ca917554f2aa33e6a05d7db8673e48a8414",
+   "d40087f2376aff837c642983d22e0289aa8d968f",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers": [
@@ -666001,7 +666003,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "f0824a2291089ee702757bcbfb44201b599806dd",
+   "c3cb404fa45538cb68e0319c9cae80e518de9941",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html.headers": [
@@ -666009,7 +666011,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
-   "54a2fc32257ce8c1cf6683941bfbc9c2184a2a72",
+   "e90461cd16032a5c5427a2b5db1bd6484f423b6c",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers": [
@@ -666017,7 +666019,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html": [
-   "e6775088a6e09ee546a93acca85af3ce98ec0963",
+   "0ae217ed8c8eefcf5a2f5b5191379ae8eac059f0",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html.headers": [
@@ -666025,7 +666027,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
-   "c2bccdf77caafccea9fb33e58bf77a71aa9c0ad7",
+   "b55a2708a7793b789eb57643f7497b8ea8f8eb36",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers": [
@@ -666033,7 +666035,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "79cd63640dee42355c94e390217bb7297bef7a76",
+   "b092571cfeb4b5a8c6633dbf134b0143b665a395",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -666041,7 +666043,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "4fc687f979b90a665c2cad53ea238882a909b29d",
+   "c0b5209603d897e1688ebc2de8e5b36b757c7310",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers": [
@@ -666049,7 +666051,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "3a24da90cacb68c8df2b00af83cd96b147950965",
+   "9393d4cdad966b1c5a69e57b94a4d4f0ddb4f805",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -666057,7 +666059,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "95154a9916d7d0237f41d82e7ff872964a1a3363",
+   "b76378b830c2ccd68f20b33fd9c084563ce88583",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -666065,7 +666067,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "501e8ed242fec50c1b653646580a3dc6ed04c1f2",
+   "9025174a4939a4b385da15315bf676b80c7827d2",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html.headers": [
@@ -666073,7 +666075,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "a49c2a05ccce259f7ee8e0d11cca869e21b466e6",
+   "e197f94bfdc1ca9f6525446bdfc275c00d294f74",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -666081,7 +666083,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "77d22e91370596bdf4b81110937cac203b63f028",
+   "dd4ebfca68cba8850a343a9a12e39437cde2d2ea",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -666089,7 +666091,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "6ab0525a97a4a3e20ca0154321068e4dd8633cf9",
+   "057f2680f765bd097687ebd2ab7eaadc30aaefbd",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html.headers": [
@@ -666097,7 +666099,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "22057804af79064a93d6270b4e8cf16c1196dd34",
+   "5d87766d2def436df7bd76e3a573b9a786e0e000",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -666105,7 +666107,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
-   "980c4a9aa467b99205ee68f7b01f2fcb14e8ea46",
+   "dbde82d26508de1131643f9f4ed82888156bd9d6",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers": [
@@ -666113,7 +666115,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html": [
-   "42c0c4b6ff8d5d12d3996a63e92af504c965778b",
+   "02ce7599d0419a183568c74e5fa5d9c8aaadf30f",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html.headers": [
@@ -666121,7 +666123,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
-   "efb989ee35e10b79a58020aca80b5063afd538b6",
+   "a6c62bec6ec669204be4bc2fe77933c27e029f2e",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers": [
@@ -666129,1003 +666131,1003 @@
    "support"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "9bc18f9d5ea57367e516330d72d275269472f4d7",
+   "e4da9e99f46b7289698f4d19dcaa68ee35a58922",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
-   "15120a2dc19b42fc87ef8b3202c983206c80dd5a",
+   "2eeb2a715669e872e7c76a40cf55f3843be4d07e",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html": [
-   "dea4a85cf8fedd9981b5f4046cab2faa78c7572a",
+   "3e8df22f781d99dbc09c99c997629224dd55b59e",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
-   "c46cbb6a1594a440caaeb415856e7b89fc0960c5",
+   "24958f59132db299c689ea48a4370616360c71cf",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "e89ee7f894090b015cf331a274b130e8398b3037",
+   "27c43706681d6fd37afb2d7082d9709bde3c0b26",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "875901b25646aa1dcf58a27487101edfb92dac35",
+   "a3b987bf9721764a453e64d2f986d68e1e29517a",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "82858ef6227f36e21c7a7002753242f67ba42c81",
+   "f390274ded678bcdae99ee3363a5c40123645ce0",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "775bf93fa3db76d1c1b41f703a7a498ecf643f54",
+   "ddd26ce66a38f08fe39f05359dcc332d87d8cf67",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "41560ae8c18de96d99017e9326bafdb55d1b1f00",
+   "79eaac2997962a40fe176f5c68d113ef11fe7483",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "03073d50e30896d5d5a85d461a48da48da9c51b5",
+   "a62df13ca5e15c35741567867891cd7b5517e3e9",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "5a1e1ccc64e95602635d98c60514c58ef7534307",
+   "ff5286575a6c7fdb601cd86ec2c76278b31cada6",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "5dab6717086835b542fdc069a5d558dcf68d5220",
+   "3fd0a99ea40e5162a18d755e90e15c58f8b9cbfa",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "50447b968fd60ed577f4871ee588640cf2a93598",
+   "b53da6f22a98956fa5554c196262a555d87a5690",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
-   "e4d2e2c77c4a714da35ac6dd360f4d2c8adbbbd9",
+   "0264f09c393f886b7892e18d908ba4bc84b993c9",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html": [
-   "374f5c0ea621751e0efc838b42f284d4ddd19d01",
+   "8258da32459279275f8df09ff8a664522ccf4395",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
-   "f02d54bd7f5888addad940acc16ad48f707c791e",
+   "90e0df722ed0bcad444e49b4549ab5bf4703f819",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "8a372cee16a6210f20a69d77a0503293667839a9",
+   "ac71e83fd2ab9583157bfce9177c71991c15fa77",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
-   "71778ee0cd7de3d7ada0c0db5f20e5f8fd92c4eb",
+   "6e38ce7a26f5763a99a594012c9765858b17da6a",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html": [
-   "6f34ef1571a923bcad4d1f60f42a48fa3777fdc2",
+   "ab9071628feb60b9d2ccac6d084de346b81159dc",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
-   "ebd930f6910d185da1802d367f9a92d9ef3f1f3a",
+   "f0c3f6e636221f377eed3a7a5e0b025f754b8722",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "18e6eb2b421688b25772339b4aeca3e6b153da1b",
+   "4595ec4c56abdcd70bca0c989525403a2cc53601",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "fc44e3e254f78ca8d4f5935117b564a6e933cb45",
+   "74551b6ea250c1de24fcc7a438ed821aa1519095",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "5c8822601909067418af96186a64bbdbcb0288da",
+   "0476d6f8440fc06118c58e36caec8cc9575b0108",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "ebf71f175382aa57326c25977131cb1656e12b33",
+   "12f9db6f8aef3123c8512aec5619e30b1fe1b915",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "bf6262f26cfbf3fbbaf8bd1c1e7ebf11a13a8981",
+   "873003b99b81f25d417942b46a9a2faad1e0848f",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "f591cbef0a79b5636d5d94d131e7a2b70ba59c51",
+   "06cabeaf21acd8f31e78079709ba586ba8f31ddf",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "ba2d54d627fb8acc31550313fc1739858df57447",
+   "b3b3b5de83fdea2a1445edd9f1bb45230a7dc84d",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "e8b0aa9e87a041999c61cc2259d009ceade2b6c1",
+   "62caaa3ecf8edd7e90605eb06304aed0346d0db5",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "a34ce0378b840d888ea5e6965f61459cc689d177",
+   "2872e8bc50cbaba8137a2f284a6d21da91d56473",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
-   "6482686b5fd610efb91f200c710faa6f8e097cf6",
+   "789b74b5593b77efcea6ac0dab2ac12d19807ce2",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html": [
-   "2610bb065985d96ca0f249fad68f05d99565b15e",
+   "958547af2c458df4ffda1d115755e57e36bd1a9d",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
-   "740895b805a29aa735ce7d38d3e13125a9e9d59b",
+   "97413c4840216397fa8ed5b8f041fb35ad96cc93",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "0f16cc626c25c500c1dfedbe7e99fadc68ca70a4",
+   "99e9bf4c7451c96f878ea1093a71c6773f5b1cf9",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
-   "681dab44cd4390f991e0f92b62e5cf65d6422e6a",
+   "19639f8418daceb50fd72db5563c466e44bb5e1b",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html": [
-   "d72aeb785a5e1b1d9b7ac560eab1be2f3c360523",
+   "8388262d65a13fe202eff7bca730d9e8269a9078",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
-   "77c3c68a77caeafde1ef58cda8cb6e7ff94efd44",
+   "3de61cf23e33269f372ac4bcd76130f16a4a7cfe",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "e5592cd0891b84d764e05392421b8692dd496aee",
+   "3522e360059cd1711d1c05c6d43ba0690787733e",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "a87451fbdce1ed25190a1c58d30df103dd12f27b",
+   "01987663ea961a4e5292c5980ba51a3d8f8a7a1b",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "631e1477c8055823914bec71ed294a2c8c32eb71",
+   "724108608a0990111ee9327eb302c0b9c68bbcb5",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "0cbf66fed61809cbd894bc0ce1952342085b550f",
+   "065d0185aa5a53b9b7e14ddb5a9862f131806d84",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "43dc43d0401be0521e6b4174a55f67429cbf4f41",
+   "2fffac47880e53995a838a710b6f89eaa0489760",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "7fe2baacff826cc8b3c13e4a81f60e3897df4332",
+   "0a3500c570c816a2b2c1f2a8a9de2bd6cc9dd888",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html": [
-   "c33155b299903c196404e8a09ac8114b011640f7",
+   "bb86346321f8698f9dbed5c7c638f2399c20cd04",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html": [
-   "eae3381ae927126b06371038823c423585e6b8ab",
+   "63b5c5a76b9674fdc96a1cc993576a8469637541",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "e1db3d1e59e260c85aa36b3d01efe592513d5e1f",
+   "77bee4533efec6f6b16bb093e5e30e6daf7de281",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "404392c8e4480efbf39b43acf9682d43ebb362e5",
+   "1545ccb90b52630e5b929e73934c00d02052d332",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "18cd15910ac434065a0595c964ac8f8bff5e9a20",
+   "4f5f456c89e1e6b4fcee3ecc9bcad38958d3516a",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html": [
-   "6fb87153b289115bc7b8769590a131daddb9c140",
+   "4c803b30288f0b2432ef1792db6f51aecbed7333",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html": [
-   "f1f759257f6380f2ac01e202927300783bfa676e",
+   "39671be7f7cb0f786e29a8539fb1a86bd878bc80",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html": [
-   "7a763d011c7544948794388d3872708a6b03dc06",
+   "a0d247f675f365031c005e5dc6f06f0e9e59bb1d",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html": [
-   "bc7f41857aa469dddb9bf7d98f85ec24e1bceacf",
+   "2f787fc985bce1a79b55ab66f49fcc7fdcf404b7",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
-   "34c72954464274c005bad4ec7078ee50c28f2b7e",
+   "4ad2229ff18ae6d7000c364db79f440309b89ab0",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html": [
-   "6386f26a9f9f58b45146a45728030f1c996ea5a0",
+   "7ce79ded82de9e08dc51ad82ef72dab52ebeaad5",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
-   "e9ffeeba0efa1c65290162ba6e98e54bfafb9598",
+   "be77219b39bca2c6596e068cb66ba02f75a3acf7",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "e00dc04118ced6d7435174b7c547bf111a49c1a9",
+   "5b3f4220a117383909fe4b47915252fec07a7b31",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
-   "d3cc95adfd84ae83f1859409c6bffe158a2de57f",
+   "8bb961f3f7478db3080c4f49ad1f777dc76dae8d",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html": [
-   "dbd4183bd7a5e522039e575e7042dc38402b5c1f",
+   "332f3826fe7c846969ca7f76716a538346d4237d",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
-   "6e07cfb0990eea42f15892f44ba237c26eaf741f",
+   "09c9f0636d516f92808fdd362205945e4332bbf0",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "8c54512a93abdb7102ffbe247f09a5fce71f830d",
+   "71785bd20234bffa0bbeec14ce8a0d2a73e31aaa",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "07e669ccf940f712c03469544255b625e754362b",
+   "8a1b13d201738a35b47790e3fa19c1666b46ef9e",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "ec2e9c64732ba247cfa6b7182762c5831f89f158",
+   "12403886df610c7ce3fa406528de1639d21afc7a",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "da52ddcc8795d55d6575cecbe4d8174a734c3312",
+   "a549e552350d428cb00d85722dcc1224eca27605",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "38e401993d8498ad2a31c61ad1e13f3252c8e2d0",
+   "1dc5657fb2ac346f664c7fd4f0fd66ada20ebdc8",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "3ae164bf11b4f755e6f54d20bbd0e17dee5ceb1d",
+   "e391b7273b9e68b04454e11ce0339c71c30939f0",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "759728b00b36553b662714852532e54730bf009d",
+   "23220fba182e27bfb905eb11026f0d055094dac9",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "7b73c8ded47dbca8ae71a4f92e442d030eabfb89",
+   "8fb47741b94d2c00f5ebb2cd53f4adcb4fd04f74",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "379763fc354a01b3ef81d058ccecc8a9005b53ec",
+   "ef8036fc23ac6752087423078e72c7979ed161eb",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
-   "90417e90e712693334cd45b3a8069ffea2f853b5",
+   "ac23978e8775df2e246ad6b4910eb1b37ba9ff5c",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html": [
-   "a4e1bee0d77d185d513540dc06d78cd5facb3785",
+   "f6bb90e3ecbc4bfacb5cfac600c31d8f49568ebf",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
-   "4780d0d4926d7e027127448f2b77d1ea2d4c694a",
+   "9f7db2bd801316dc032f243d59b562e4efa2f2f7",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "d4d48c5202e7a6b365c93e24f15b96a24dc46bd7",
+   "93678e42af61fe5dafee8c01fb50979886f1faa5",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "bcd0a811b2e1cb630d871cb633492604d11609d6",
+   "1167119941cf461189c06f7e8fd1d3ceee037914",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "55346939f95cfbafae7ede4e0ceb3b0c3015b9d2",
+   "558f6538c853ae677105edcd71ce0c5aa4bf43e8",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "e377fc3771192c13bb2645971622fb184f7917fc",
+   "4ea91857c495a0fda2828abc15162cc14d415c0e",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "2b2c1b287c854ff2b85c94946fcdcc9405792a2b",
+   "f243ee2656004ca5e4b456f8690d649e197c5f16",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "e4d5cd7dc6192d918bca15ca557ccc63244ba0a8",
+   "f335481c2119108933b9a16147bc4d3d9d726ab0",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "2361a04f5fa6907963cfdce2ec673ff03485f3e3",
+   "1284d299206185ae5a082f093f30cee8f6f89649",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "ce4ea6be8cf0ac618af5f9a34633a23602cb66c1",
+   "852270205abd6fbce7a6bbd76f60751e793837a6",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "2dc068ac4e5fae79ab0d6e5c9c2397913c47d389",
+   "b4036ad1783f841435da1b47a02f614db168e0bb",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "87e94c62d012a5f0e4d4c1711eb2307e49c8b481",
+   "c0907438fadc1e37bfb3ad751a1a7135a65d3420",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "b495fd2330545bea90f7164e588723a5d0de12d9",
+   "2e1bb1ec444034252c10ebece35b15da3789e652",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "8d6e5f548fd58af1b44d8798edb77a7b7c5f67b7",
+   "e9261bc57d58a9e28e171d368441b941b1b19359",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "5fd5bf6619463da516c9f0a2bb17f4f7d3caa814",
+   "3d46e709fcb0f11d8516d1363cc9da06def984ff",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "fb46a40ab9a34071655745d39599a51cd4f73e72",
+   "0b778f4997f1485f660be2be43b8d5add7bebc8f",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "5d37c9fa6e80d587e107ec2ab40ab99c8e832df8",
+   "d5de49051f09b81a4ab6290e2d1d9c114eec975e",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "efd91432012d924c7cb9e5d6949e1621d444f416",
+   "d7e2a54fd1a99189bf358b64b4c8928072f282f4",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "6198659416b66a805f0e7485d70888b7b4b7e7e9",
+   "ae40fbac02746b1024fc9a34a80192d38ba8751f",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "67f0f034fe8b6e64d4323d7135ae5ae3e4bac673",
+   "10c558f7d23da4689ffc089daf07dab06809de44",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "fcfa56d773cef63f9c2c9eeb28244d906b337bd2",
+   "117dbf8543f88f7819d3dc839af7dcf04ee058bc",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "52400d6305ea1d858ef8f242dec308245c35ef12",
+   "c0d9f6c81a3c07f685347ac9388641f38c187390",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "29c0ced3a221e51a886aae99dd4a938562809e45",
+   "2099d0da89f08ee322fdb14d8cb64c2950ff88e2",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "7c8e98fa37c7bbb92c03d9d83518f5a105885973",
+   "7b12dba78c7840f69f802e8c931efb9f5633dca6",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "e67e90c809349dee9db0fe04253fa61195a86b29",
+   "729766edb534fd89d03a72bf4eeea678b0b3ded8",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "18667759ea989c66ea681d0539115309cec7f78d",
+   "3f7f04c97edbf25357fee774d5e7ee9735d96593",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "b47279c1ce6036cb80b46755a8381ac270728748",
+   "0fa59706d733b6d8b5254c8fcdca5b14a04f0a30",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "997bbf49e79710a67036deb9ce756485f59b03e9",
+   "9cd46c0db0dac2cbfb7b1659b845cad0f3c72f8b",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "9472829baa6616ded9a7becc7a08709baffa67be",
+   "d913fd518baccf82b0e7297892c953d70a470a93",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "3668aee53c252962533b6fcbc98abd5bfd9a90e2",
+   "dabd9cf66de91a717eb4fffe1bd5e79a591fe095",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "2cd7df0252b6c3cd514230f6830486db32f82a9b",
+   "1c5a69f8f269ce61faaaa5832fa74684fec09504",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "3345a9ed2a5230f618963b0a500020fd29a4bd4b",
+   "08c5c1df2df79e1b05e5780bb5a3e4bd425207be",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "5ed0f06af2ac6a49ca34c5bdd7ca33a40f5cfb28",
+   "6edd0b6222d8dc4801f15b23331a709e27ccc59f",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "cb9ff640eaef9aa30d13d174fde7d970c8eb9310",
+   "ba34cf586d204f28bd01fbd0a658265fd7ec2908",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "8f98188146694cb80909dd2a1d7373948aa18096",
+   "6dc6e580fb1adfb352f3dbcf9c5a7fe2a561c8d8",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "8c134e9c3aaad6aa1f610714752a2d52eb54b83a",
+   "1869a4aeaba5d6bdf9efa7239059041619ae7ef5",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "7eb82506233b6e096cd6ec3cfeda542cdb065243",
+   "9370940f5a1de986f71891f9c886dd377f0a74c5",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "35e905c392cbcbd63b3f432873c80ce12ffb82a1",
+   "6364a6bc8465899148718bfda0960e33bd04f764",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "871679a6eba10077edf0736fd89fb18f62a458a4",
+   "50f9ef60600c3e62829b356c9d2cf5e7c9479ad2",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "ceb5586630afa439014f63e39be956c6e5654b61",
+   "104de66bb88561041c9b8c178ad89a8b6e6e1ba9",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "3ea90747c0f5900c7695ad7bd408ffdd9913ed2a",
+   "c253955bd2e4d1cacdfac80a6bca489205d1d430",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "5b89eb7aedfa3fe90e6bf8623c7a731342459a1c",
+   "00058b3bfde6bbfeb0c1a3d51e3e90908cf32516",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "e750aa9186ea06fd37ad1643984fa077eee04f05",
+   "c7c15bf7f361e057b2410f0c74508171df0094aa",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "0665510a6475de5e7e62308b62b00001bf16fd54",
+   "3c28f7795e8bd0f4afd8be69793b76268a19fb4b",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
-   "a93c94af59adba2e14222e6a2aa52b40eb5f30ad",
+   "c14f0f8a6d3ae371aa83260c4b6fa5949d5f4fb8",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "6665a2f354a827a29b9427a9237cf29e210ce72c",
+   "0a7733497c72a61b8781d3c71a95a909902b9ece",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "b380ce0c91e64644d486eab62ff31e4f8d6463fd",
+   "7fa1acae0d67bbfc92d6b4223556dd483d036f92",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "1894667f01eb8d8bb20b1410711794cad5a98bbe",
+   "b21bad37d592a055dfb370f4d50274d297655619",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "033feffcce4e526abd27bedee4118a6e152e9632",
+   "6ef1bfc097332ca7f28298d15bd71a425ab4422c",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "1f6b62841e0d028e50a46f9f7c1ffb60031b4c9c",
+   "a1a9cc6e212f05c2c5432cd95aaffeea1970f80a",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "88a3e42a568de756cf1dd05acbcb4fd0b430fd36",
+   "bf66c513f8c6a98207d2758557d0fb81b13c2797",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "69d835c3d83eb91e0d2be7adf91cf836e2f9376d",
+   "e00dbee878bed96c2a3b0cc3fc27a8b934e0d42c",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "ffa234c29666978ada0495b326b82f4d9f895010",
+   "fab4c3750452981d09ac49f55e126b2dc3ed49f9",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "f92abf01b85164fa38b57e37741885e94c23585f",
+   "922da3091e232636fa4824c8ffd22ff8e0f43edb",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "953805774289bd92bbe599315c8da23a43ec52df",
+   "49b72b4b54cd51e5f553efd627f2b11a636b577c",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "b6191fed6954ab4a85d785bfd70746844b5676fc",
+   "599ba30a37a77d476070ea5b3b727dc2afc833e6",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
-   "635ec9d82cbc38a43a016ed350ea0ee8e3c93949",
+   "d456f4fec7be24155dc8c10f0a2b4638b511ae2e",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "00848d6602feb73e5138955e821eeb3e26815d7c",
+   "fd6e2e0f3fa81b487c36dc8d1173ad06c2b28d5b",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "3ddbcee365f1eb5c8c1baa174d90dfc8953cf275",
+   "b65752bdfbda21f09ccc83fa8e7c384501706dae",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "00cacb9060ad73344a781d76a3b22c1927c43e5f",
+   "599558d826a246532d17d74449cf1d6642dbf6c4",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "68b8f69e5c63ee92e357c722a53957439869bea2",
+   "edc3544fc94b0ac8c562e7ead343c8e9261d4b81",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "9390b64fde83b9f5dd4cf5f087d54a4073899d2b",
+   "0bc0ee857521d5fb1ac42297855db28fb492849b",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "1c12c9ca24cf58e414c9180d4d22fd0fe380df9b",
+   "1f9110ca0008510713279440ef5b8ebcbce04ef9",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "a76c98066ac57da1d47708f1196b20f2a7d28434",
+   "1bcc264cf04faf25d1caaeddca8f76aee5ebe349",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "dd1c82dc6ccc916ff778737735ca9194c8f732ed",
+   "c74f071263bd0dc3c7f0c1fc31cf152ad77eed52",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "307c7621135d2f80e90b95d5da4af5af050ab5d2",
+   "d1f0c2e1e91f73cfb5219b30c46fafe072365857",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "30530e6636a633547ec810103ddc19c19d14a742",
+   "9569bbb4d5d4eeaa0535fdc4c85760e1189a4467",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "d6e1c283c399c8e6f67df8329bf3f5ece3a68d7a",
+   "e527876ac0e04d144368a1471096ee6fd95663e4",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "19666416a90c55663c58881674f33d0488711cdd",
+   "1e7cb029ac17f5a585e1afbf5a7d38a19a9d7c68",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "f05d225d8111bc8456337f80c001322594b2b4b3",
+   "9f070f67463d14b1d4d9b726472d3e9703a06d5c",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "efa96f50fab36c2cd14e2154418f05a2c12891db",
+   "a6f3cc71c2723800a28db8b9f0210e09e49ce87e",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "ecc377c6870cec8133e04a5e61d37a8246bae319",
+   "7c2f24e314c22a89c622baae0fbd8c92ef6d3206",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "c5b47ed3bbf20cabb741c15360d27d5fe616d7f8",
+   "6a530fc09ed68c037e6fed2103f7156b9b49085a",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "f8b744f618cc7fcb3d4144c5bcb19982ce6f0a9a",
+   "5e6ab1985ac62523e00f0a0b39348edd1e834335",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "6a70b5b42a19add193694f3790cb9430b2a8a736",
+   "cc182c1098effa67b4df0fbce6cdcf3d81d5304c",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "36757f5dc623ac42ba99188f783bdae3a2618aef",
+   "6f84795a62142c072aa30764d37f376c774bd972",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
-   "c75ea8d74cf6b60c8531a785d7dcb0e6ea467a5a",
+   "5a17464ef25b7fa4188442590b672d764ce9c590",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "e765d82001eabb5f4ac179dfe6a2c3fca5082db8",
+   "d547c4b15d839a107709ceb3297f74b7527ca428",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "5d2c1268cdfb5fd787e6ab36ee8abff3d7275742",
+   "3e2b15cefcd6072a04e39e1b47b304a05a732645",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "07850f1d2f5ca1b47ef63eef53ac1617e419ffd5",
+   "6f34b7f039c7352cb80b1cd6a6f12aaff5f90485",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "bea31157fe5c877676d1772699efcbe7171ad547",
+   "7b3143e624f08fe05ec5e242d9ddca430927d073",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "b1e6128a3ab5e421a2d71a55e6ac49022b086f30",
+   "00840f73e6237fb7cc150387931fb5c69bf883aa",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "187644769c25c72fdc1e91ecdbf08d64f5a7b4ae",
+   "9d1a36f454a62075cf624f6d062eb937a3282cea",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "621aaf86a285df38b4298ec486e25016d968f004",
+   "f50ba2946a6dd838ae87ec816c58eefc44c87dc7",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html": [
-   "aa5a9ac86bb5bc899ad21444c9591c33273ea09a",
+   "ba6b200df2e853d930ff1c8fe02c31e83c237a00",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html": [
-   "c2201e9c4e210fb68f52b924d96ed0268c09ffa7",
+   "65131c48982590adaa89b7aee1ae1f0c05e42e3c",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "2c16b549ae919f7f4524d0f455434df0456f1e34",
+   "4076b3d0a9fd0f7c6a8e38c5e1c641a1abc13abc",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "2c66e693d31e99cca092505531b88f52ff9fcff8",
+   "2ad2e9d515854493eb0c751803e46f65663656d5",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "e6c6432c015f5f4ab5d987bf68d7415fc5e9b3f5",
+   "cd641e7b903b3e11882711838e4361a83d10f8ab",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html": [
-   "f5b7e511b3622712564d0bca03dcc2131b983ffd",
+   "699a94f9a1cf2d73a8b05216d4fc2f97f9af2fa7",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html": [
-   "526e24ac4c9efeab0a6dbe15693a9b4827318055",
+   "0910fa386b2cba23f49b41749b208e1a673f11c7",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "686d4feab2f2c84c8bccb587da23f8c5509c8d7c",
+   "26adab8772b19b17ad565497cc42213fd96adfe5",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html": [
-   "63195e03a244cc0ba3c134674384ff5569a983c5",
+   "54b50413161142670d28e58a745611b728cb6142",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "ec52992fd9273f342503920e6aea8fd565ad52a3",
+   "61dac7d3fe86ada1b8f80f90189e89100a0f17eb",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
-   "c0aef90b38c1c49970172be05f5aa6481e849361",
+   "0bba74c770d9763296ebe5ffe187d46fb39afffd",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "76e883fce0d1c63e2f76fa844e352068cfc2a1df",
+   "87df303a657be8d3606f9432335886123e61b565",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "00e67dffba8f89f7134fa56a9b3e9ac424402426",
+   "ba575736b5ac6e0867bbdfe5c8d3814dd05a3abc",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "d719b51350699da19d25410d014d34daa60343d4",
+   "47b497f2b0a2e164d9ddfca3a8a01f4d8da34d1c",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "21b899d88f284e08caedbc10eb97765e9b6f63e9",
+   "f284f6cf44fa63402ec6abdb12d6ebdee305fc7e",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "e83e55eccef091c41d11586410dc4e8d16e2b64d",
+   "4f5cd420094dbf33c0390b05054595c0b62d469a",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "fdf3cf38c7559d122dbee9b575205f009295e48f",
+   "40e927d4da00f8ec3e2f04ff089c3eb6e9f43edd",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "ff768ca6241dd343e3a8d5afe6adbae81e283118",
+   "fdece9a07e232a81aaa2d7f8399249e41ea95912",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "b36050b5ed1efb9d3dd30bcc766842d5783068ab",
+   "f1b517ebbf766d0eddd1bd2f258a43620ac18c7f",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "943ec5cf35f98afdf434e35d69533d4ddfa88294",
+   "5cf1f7c7ada0df74a272e36ddb968086cfdf907d",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "44cf0ddecc4288ebc542758a4faf09432e6d0405",
+   "4b97c9b6c562079a220aa040143f74c1e423e703",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "9df29013d07988b97b309b6c5b2c03066ff21407",
+   "1ae3c471c51a8200f5ae0c3a96f55bd90ce2a1f7",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "5b392fb53f5cb8a7cbaddbfa561cd2844a0bfab5",
+   "00f20b1e7e0e98d0f48024630711112933344713",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "7d6be6e4dca2400da2ee629ced71523e089cf57b",
+   "a39a72025c598a701f00654db3dd32d985557c49",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "29c554a2fca1351fe172d25cb40097c67a0b5df0",
+   "4c42aee6507b3ce174ac3298775749852b97d2a4",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "2f60784c0d99d4549e81719c14692d18f1db5789",
+   "d03e62030af767da80fffce83464768067bbdb88",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "179877264a64378893de0789164e2cae89bb143a",
+   "3eceeff71bb0fd9137cf083a863ad64fba65330e",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "de46596f96af49e6267126706d413273cf3afd02",
+   "eb30e847d25b466f3bfe49a93ee251b79331a653",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "d519295475bb5bcd8ef97581e870308254ee6596",
+   "7c2b2347b1b1cc1e98d10e2e79983daca0b86c55",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "4ee0c81a535c25b43d7c703b60232c2edef587a4",
+   "a57e2a050a2dfd8f24a7f65ddf84e013274c51f0",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
-   "1db8f0d996438fdfbf9c4df2bc8adb9b9c3d7a63",
+   "ac03ced7b71f8c42ad89b6059679eff86622f9ab",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "5b1533620e61a33c1a6c00d3bf436fb65a3e27b1",
+   "f08ddef240d2170db06f1da138917b3c7e2b4631",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "30dee3506adc27762c2ae15d4f1b808a24c2ef74",
+   "1836ebdc7566dffd57fe2763aa84220673f35c01",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "31b50bde1c8d41d0b591d4d327a504102c0e5f03",
+   "65b503d1df47e826da0c8f3b1bf6bf42cfb95af5",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "cea04e81a0f1d0d5d2170c50ba56acdc681ba14a",
+   "bc7f9ad7cd4b24885d2fe894b00c47a943de393f",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "0e646941205f2a568d7bd91f0df79e0ebdafe650",
+   "3bdd36afe7f0df1a7c837786d88d023bc075e000",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "f99e0f0ae3070b1a95bc1ae7c939766c02146c5a",
+   "732d621c87ae857dd1bd579c38a6cfc1437738db",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "1bbcfbb06d347bc4d2fcdf62420b7d8bd506e972",
+   "8dfe8880440fb2ff076e82074e675f7e3a899485",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "a35c885ecebb01b6b4cd0bd132a359342b552343",
+   "89cd0526660408263c18569dcc74e6250b993e2d",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "7e46eee5ea070a6221bd84c825bbf7624836c1bc",
+   "95976e0878fb7edff6de4107f7dceac3c9b295c3",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "3457d393c266820832ed8d83b393165886db421c",
+   "e5a62b3e07f54a1d0ca8b4ffe6c1d8b99b3c47e3",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "690b427f4b1daed5a1d2107bf00e2393e711953d",
+   "00c5d396018f34065e811098dce5d783ae9ae2b0",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
-   "7c1838c5158c940798d0b127fea7c3d2ca62a4ef",
+   "5a1c26f8ad3c4f948b3f90c6c5f3e5ce52a54338",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "b891494cb8875093a8c011a4ef6ba506b007aa20",
+   "c1d5b4ccd7c2b97e18209e676553e14f33258df6",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "4c07e9aeb6614a23b14c8b0fc588b07b0b801816",
+   "c2a56c863ce41aca1f8b98006fe9e7ac905c4b72",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "58c6f098cc16449fc5e191942fd677b42fd22f14",
+   "9c399c3bfcef445cbcbdf339ccf3fed69cb4e877",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "31da00276bde4b6f8b04d5ccdef65750a184e981",
+   "60ab186daa72caad1d040db8422e3d5d8b2f837d",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "b4448f4dac4f7422cad354645b7abe64ab9b4d6e",
+   "748af8f5f86e757f7e437a23f2bd21a8e631dd9f",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "a9c58e69fe07162d1c44dfccd9e905aab2a7ed52",
+   "0d30bade3fabff71673bff4e27067b236a641409",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "71e9f32ec372e43da2bd2971ce50c55a43c3ab00",
+   "dddfbef0396fb8a51c822594317ff2b618abe42e",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "da7331ae14d1d064d102e3fa71f402abbfd6ae35",
+   "30ad89093ec435e7cdd9232c2042390badc3f7bd",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "8fea31f3c85a2fa6ee1e71adb70ca1b34460fa5d",
+   "10b3610147636ad8daaab09278f5e04ed4d62769",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "476ddd04ec52eac60717104497fc847161b93e26",
+   "9655342103fece937ba00d9c7b58c9c207089f53",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "a583699ffbce0da85e769d9c3d318130bb94f2e6",
+   "719669da9a2c6dc626ea588bd3c0a029d2eb2411",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "6f60845874f02f56b65d702c59947bc28b6688f7",
+   "b15ff922c115da667c25c778cfd57cef9c0b721c",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "88f9b2ff185a04088d203fc0a6b8035e08096935",
+   "4aaff556215ec19b89e3794acf1f08d855f3e2ec",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "c36005af7ab6108552509ec90fd840db58ab35c8",
+   "eb55e13e77dc3a1fc0179e61df027c819cedc4a0",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "1b67733527e8f4028ea8ee48c8b154cce63b181f",
+   "4ee8c7941053a0bb64721652e9ba0de0d601e78b",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "0003f46e35175fe8d18dc82953e57a76c30c5eb0",
+   "5b8fa9cc474ea91378a2a4b60c22291366023820",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "89749f24178b7dd9cc19a36d06416ccc85f25c58",
+   "5504dabd95315ecb01693ec301ed662265474756",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "3e9b3473de133d9503fa33bd3af13d2bc5e8b444",
+   "e9054bff4305d29c6ac58f92dcaa40b6eb776d82",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "36911507e2682cfc10afd252bd52b65796703919",
+   "e9940a8d929a59e4ef1afbb6a1bc76a380ae9bf6",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
-   "e8487bca9fe70c665aae90d7c021204d29356f1f",
+   "10b0d60b2f902400bb7551f1a9485b8463aa243f",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "f3a2ea7278272ac5e86b4fa543c13ea9fda0f106",
+   "391be7ae10106623ba499b6f25370970ac5e7647",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "4f0899351163f68636c70c098f8988e85d9642a7",
+   "020a95d3bca8e938f32ecbb2cf6ab225ffb65d7c",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "7cae21045babcba90aac13bb5b6b45eec8a2f715",
+   "50269b158f11e49316a1934d6d80b677520ca1bc",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "59699ea0c70495429b5e0741157edd0243e5c87b",
+   "8b4d43c07fa06c10a3e3cd287e6868791786973d",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "a0e4f7aae5aa29ca26c9ed90694f04ddb56f04d4",
+   "181944a1b61e50f4ced2461b59f877110641b3fb",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "39bc55b03c79d032b417cea53f86b465dc45a018",
+   "d93785c6000ad5ec2ae1773d9409cf980861c486",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "842e32d571fe2af5253a171eae12bdf8c3f39848",
+   "7329e02bfb1a805f7d2137de75e7605159ce83f0",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html": [
-   "15103438ba6853acb9b111fa6b3bf883d46bdaf7",
+   "4f3f00a55f746218e436eb27daec34ba130462b9",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html": [
-   "37e4203474d4189565b237457ee29fbfcfc12278",
+   "0c53605d2fa2b62f7d37946ec7844c33cbfaf896",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "39410f46c6538378abba4e442e7b8cf92c5daf97",
+   "3a64fb26fe6797c794404cb6c33dd52a729e71a3",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "74c79e9fdd8dbeea33993d222e162a777ef61a5f",
+   "a228469d11d46cab2262af31cf0ba06c95e091c1",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "5a66ee358306d08eda6d9ff4a089efcc7acb7fc2",
+   "7428dbf85b95652a93788b2fa7b698cfbe37d30e",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html": [
-   "a32157dca017c4df12157a8242eaffb6db4cf5fe",
+   "ebb22260c75ea05eedc46df3801fe07e380e6d7c",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html": [
-   "7031f36f36f85e57642249f5c84d8f9c9f9cb088",
+   "39b2048c8a27099fc9b3f6eefbb5c205dec13e0d",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "6500c7f756c0ccafba428c8c386081cf7d5b524c",
+   "b9819db1faef78d5eeca35ca37f00fa457928c2e",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html": [
-   "5f10dd7f5e9d8535c24b8170eac6cf8e1757715d",
+   "65be8f33e0aae71b09cfd2989eac89674acd2f3b",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "85ecb5e6511ba5382b54de7c3be4ff70c92144fc",
+   "abb3d72fca7efd440a89203b528c6f0b3e772644",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
-   "c4207cf8b3037faace459306281e9a3a6bbb6818",
+   "87d2aeb88e548ad976cbb253ff148e246f553c0d",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "359326b1a007d5f970bed5c3bef9594b7fe38b3f",
+   "1989f796e104afe2a16a5fc60b6ddaa87a3815b9",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "2f6ec65f99f2acfc03c5f4b0f5566a4b1c4e0de9",
+   "addd685a0da71b2c7047054b00c5f27fa92aff87",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "8378e3f1b165e919e827abfcc121bba4849cf6b5",
+   "4c15c563c2403c04722650bc6d3aec88ce1e7ffa",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "735dc7639f4ec880b195436ccd748d3565178d30",
+   "45f57513a6bfa8b7964cfa4ee35da0b8b6a0b0d9",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "ba6d9abb3735cbc0f5813cc175bdc54987c04bdd",
+   "c958f31b91f8fa0ba40dfc48e8fb573d0a219bf1",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "0d8231cfa4cd7849b182c2d6a613d8087ba91eb8",
+   "39005dc819d2a5a43719a0a3a45fb5fb3738e0e3",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "82296dc3819291f549bd87659b6d4b47890aaf18",
+   "a51d2fc5ef41a3f64af4d9ef9f30807430be6c48",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "7a7c19a6d8d96b2a6db20034ddfa0fda3f2784a9",
+   "9ab1701e208bbf3c0590fd558b948d1ac4288485",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "241ae8b800269821e7e89f9f777205ec75ed6401",
+   "e34b1e98a320192ec351bbc24352ecd5b4ba0e87",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "57e56be554374dac3d33c94aa5b7c761e31cd8a2",
+   "3e4e70070e023e7fd0ed6e04f013882317719c6e",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "98738a646dfa3043fa83b21235d609faf4230a9f",
+   "025b656bb760633c6527dd59394cbc37317b04ae",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "3e504c04971142b55760ea712bb408d7ab9c747e",
+   "600cdb9fc92a13e2c8615191f9cce1ff22ad1e4b",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "f48e258f09312c359b9666afa79a1f3e9ebb0d5d",
+   "e95715a151035fe3224154ed2bed83f240e3a65f",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "59e01959a1028ae4d0d7bac17b4fa79870a8f0a0",
+   "b9f74bb358e03ef257cfcbdb9b950e6dbb20c436",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "32e8231f01daaffc8b43e07721afd25fe9f9c657",
+   "3713018b868f5f2d8d5e7fd585e7fa73356f2193",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "2d391dbbdf5c4947cbec21ae695537c5d7856a23",
+   "fb74c67677ab737959f02566da31306f7bbd8d2a",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "0bd9d4a42c83be578ad1dab6f48bc384bebf2972",
+   "001021fe4a1e3a8a2b205ebd9cd0aa6d68839047",
    "testharness"
   ],
   "remote-playback/META.yml": [
@@ -672581,7 +672583,7 @@
    "testharness"
   ],
   "service-workers/service-worker/update-registration-with-type.https.html": [
-   "b712c30f71e9a81a2832c0cd5afe7f5630e34071",
+   "e7d3692812eb8a24f253b87e157f4a4366e3098e",
    "testharness"
   ],
   "service-workers/service-worker/update-result.https.html": [
@@ -684753,55 +684755,55 @@
    "support"
   ],
   "upgrade-insecure-requests/animation-worklet-import-upgrade.https.html": [
-   "38e89eb8bd6eac913e4dced157a04a4f55e3e16c",
+   "5f65f2357fa462e9668aa20099271cd8508a832d",
    "testharness"
   ],
   "upgrade-insecure-requests/animation-worklet-redirect-upgrade.https.html": [
-   "87d0d2aa2a96344f9c0bdb1872f1f1780a9b1ff4",
+   "0e2c86e83a63b454a834df80a8213d1cce5d3276",
    "testharness"
   ],
   "upgrade-insecure-requests/animation-worklet-upgrade.https.html": [
-   "8a68b2d94ab1884a2356d6a70d48dbc719ea3c85",
+   "208e324a99636d57368dcd39c0c5f77d969b286b",
    "testharness"
   ],
   "upgrade-insecure-requests/audio-worklet-import-upgrade.https.html": [
-   "56d7259647c3439adfb1508261c803b2e927c5a8",
+   "d8d44a6a0e5df2529f388f0552114d16abcb5303",
    "testharness"
   ],
   "upgrade-insecure-requests/audio-worklet-redirect-upgrade.https.html": [
-   "2e1984f601742d5c47c97472159547798f6802b3",
+   "63848c60d8c145edc6dccf673c047d26f91d2570",
    "testharness"
   ],
   "upgrade-insecure-requests/audio-worklet-upgrade.https.html": [
-   "91d52adbdd3e7a6ccb7421d065d61d6a0e283014",
+   "52f1c4d5f6962651785981b710628feb47f3a427",
    "testharness"
   ],
   "upgrade-insecure-requests/iframe-redirect-upgrade.https.html": [
-   "72047493f1733f5a7af17036cf592371782e322b",
+   "4b4a21ce919524677cec64dbd6928ad3ce3bf8c6",
    "testharness"
   ],
   "upgrade-insecure-requests/iframe-upgrade.https.html": [
-   "60c5aaaf95e73ac136682919cdeb4ac95bbff6e1",
+   "53c9997ec2d00c996a84338f2e6f3e068bbbb27a",
    "testharness"
   ],
   "upgrade-insecure-requests/image-redirect-upgrade.https.html": [
-   "69c3f1469e7a178fa1cb5b278ce4f59307b94c16",
+   "5c7d8934c2e9022d98e32567a61b604f6c8f1369",
    "testharness"
   ],
   "upgrade-insecure-requests/image-upgrade.https.html": [
-   "5ab6306ed46179aef07c95829496517468e66d49",
+   "6f897050d48efc07ed50e19bfb628f732f315029",
    "testharness"
   ],
   "upgrade-insecure-requests/layout-worklet-import-upgrade.https.html": [
-   "ffc73afc42ab1041cce3bd7f2567e27509d18204",
+   "6e9ae4d36f207b7c31c0e6b1238e1abc1bb9a970",
    "testharness"
   ],
   "upgrade-insecure-requests/layout-worklet-redirect-upgrade.https.html": [
-   "c9c953170011480cff869e03eae9d2e8a44c9a76",
+   "d04165f32c390b22f9974dd868520b5cc7333597",
    "testharness"
   ],
   "upgrade-insecure-requests/layout-worklet-upgrade.https.html": [
-   "7cbdff3902c12e0b93d7a2af68eda731f98ee5ec",
+   "191ac12d3cab1c7caf2c9d63025b815d08c00cc0",
    "testharness"
   ],
   "upgrade-insecure-requests/link-upgrade.sub.https.html": [
@@ -684889,31 +684891,31 @@
    "support"
   ],
   "upgrade-insecure-requests/module-worker-import-upgrade.https.html": [
-   "0522051ebd49cab1a3bd4753cc22f9dede34820b",
+   "22c1600e13609d9292029f42193fb78565a68935",
    "testharness"
   ],
   "upgrade-insecure-requests/module-worker-redirect-upgrade.https.html": [
-   "132663e3652b110b21a1b14d0887f26b7c753d7f",
+   "936a7944b4655ac2744af401b502b2a4e28f1aee",
    "testharness"
   ],
   "upgrade-insecure-requests/module-worker-upgrade.https.html": [
-   "a4be5ed45a9db9bc467b1a70878b307fea985785",
+   "6de610a302f86f61df933f96f6d1a92a2666a4ee",
    "testharness"
   ],
   "upgrade-insecure-requests/paint-worklet-import-upgrade.https.html": [
-   "96d68e260bbcbbb5f5c954f9dd8ea9ec0c9258e8",
+   "da52df5c9984521dd80dacf4b28e9e0c7a5b8842",
    "testharness"
   ],
   "upgrade-insecure-requests/paint-worklet-redirect-upgrade.https.html": [
-   "0675c6ab0cbefda3007b0160cdcbc5f77dde3db6",
+   "b70c103da4c607f904a60eedcb9505894837a0f9",
    "testharness"
   ],
   "upgrade-insecure-requests/paint-worklet-upgrade.https.html": [
-   "b4f1aac04dea30a5974fd021c15bbf6c349c3723",
+   "3f2790a1092267e23e489b2ca181d99286ef0f42",
    "testharness"
   ],
   "upgrade-insecure-requests/support/generate.py": [
-   "2676d0c68dea98c10413e1ea2fd239d457119afc",
+   "8c8cca21273013693d94ecdae3bc401f08dc1241",
    "support"
   ],
   "upgrade-insecure-requests/support/pass.png": [
@@ -684933,7 +684935,7 @@
    "support"
   ],
   "upgrade-insecure-requests/support/testharness-helper.sub.js": [
-   "d7be710dd24b750a0d214fd8d24210c2ab3f9802",
+   "70378edd15e6a9423c91ca6d301f4e66e195e998",
    "support"
   ],
   "upgrade-insecure-requests/support/worker.js": [
@@ -684949,19 +684951,19 @@
    "testharness"
   ],
   "upgrade-insecure-requests/worker-redirect-upgrade.https.html": [
-   "19fbb1fc5af3b45817381587da8d701f5f0d790c",
+   "486965c438698fbb16e8832ec3d304c4372b4075",
    "testharness"
   ],
   "upgrade-insecure-requests/worker-subresource-fetch-redirect-upgrade.https.html": [
-   "91ff96d978c3ba8e5e1f01b3a284d2f3d4d7bfb2",
+   "b2ce2cfe4043d2d022a775c77244144b4dfdb5d2",
    "testharness"
   ],
   "upgrade-insecure-requests/worker-subresource-fetch-upgrade.https.html": [
-   "9fb4f853452ce9ffe795c803e22d18b1cb54c311",
+   "1639363e898b8faae7cb4fed0014696e6147d8f5",
    "testharness"
   ],
   "upgrade-insecure-requests/worker-upgrade.https.html": [
-   "9f2cea16b93510c9679eb7cbd27662b4d51fbf22",
+   "2b0a6a757a2c1833ed772b45d4d23e6d1687f395",
    "testharness"
   ],
   "url/META.yml": [
@@ -693081,7 +693083,7 @@
    "support"
   ],
   "webvtt/rendering/cues-with-video/processing-model/regions/support/scroll_up.vtt": [
-   "0b88020d29f680718e95d80a99babd926d40c039",
+   "c2c2ff36ba48ca1b5ddb873f0190635bd956b878",
    "support"
   ],
   "webvtt/rendering/cues-with-video/processing-model/regions/support/single_line_top_left.vtt": [
@@ -693333,7 +693335,7 @@
    "reftest"
   ],
   "webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre_wrapped-ref.html": [
-   "ac208c8f1299d28789a6cdff3e8d2ff411852bc0",
+   "f568217a1470a0d3e05308564ab0b69622d5c0a3",
    "support"
   ],
   "webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre_wrapped.html": [
@@ -693517,7 +693519,7 @@
    "reftest"
   ],
   "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre_wrapped-ref.html": [
-   "4acb7779df94c19a44e0cb08bf07f679be866d62",
+   "b8b6025c31d1686867095dc9834c7c7cded7b072",
    "support"
   ],
   "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre_wrapped.html": [
@@ -693685,7 +693687,7 @@
    "reftest"
   ],
   "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre_wrapped-ref.html": [
-   "1c91eb7578f848146b4400a3f3c48bd6654781b7",
+   "a681294feccbe10427daf6cbb5dbdef2347303f0",
    "support"
   ],
   "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre_wrapped.html": [
@@ -693917,7 +693919,7 @@
    "reftest"
   ],
   "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre_wrapped-ref.html": [
-   "afcc80c13402dbcbeaa046af74c4b2202b86dd02",
+   "3eb92d702acd5dce6faf79719feabced9a0a8db4",
    "support"
   ],
   "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre_wrapped.html": [
@@ -694181,7 +694183,7 @@
    "reftest"
   ],
   "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre_wrapped-ref.html": [
-   "ec2f45926a2431c4a263ef75efba247ed0c71d06",
+   "8b9f12a4e0b1ea066bc56f8e9c15da58cc86d4a3",
    "support"
   ],
   "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre_wrapped.html": [
@@ -694357,7 +694359,7 @@
    "reftest"
   ],
   "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre_wrapped-ref.html": [
-   "aee2b7db423b7c57388bf099c75ed52cd837f326",
+   "5f32a25d3fd76dda2602e3fac84329528ca890f9",
    "support"
   ],
   "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre_wrapped.html": [
@@ -694421,7 +694423,7 @@
    "reftest"
   ],
   "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre_wrapped-ref.html": [
-   "6a7e65867cb087f7e767e98742154c3c2c06b1c2",
+   "394549b1d83b7f1ae0f74e07351b1a40c44bb3b9",
    "support"
   ],
   "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre_wrapped.html": [
diff --git a/tests/wpt/metadata/css/cssom-view/scroll-behavior-smooth.html.ini b/tests/wpt/metadata/css/cssom-view/scroll-behavior-smooth.html.ini
index bcd187f508c..8e2ceeddfbe 100644
--- a/tests/wpt/metadata/css/cssom-view/scroll-behavior-smooth.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/scroll-behavior-smooth.html.ini
@@ -6,3 +6,6 @@
   [Instant scrolling while doing history navigation.]
     expected: FAIL
 
+  [Smooth scrolling while doing history navigation.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/encoding/single-byte-decoder.html.ini b/tests/wpt/metadata/encoding/single-byte-decoder.html.ini
index 8eb25104301..f25f1e05d0b 100644
--- a/tests/wpt/metadata/encoding/single-byte-decoder.html.ini
+++ b/tests/wpt/metadata/encoding/single-byte-decoder.html.ini
@@ -55,7 +55,7 @@
     expected: FAIL
 
   [windows-1252: iso_8859-1:1987 (XMLHttpRequest)]
-    expected: TIMEOUT
+    expected: FAIL
 
   [windows-1254: iso_8859-9:1989 (XMLHttpRequest)]
     expected: TIMEOUT
@@ -108,56 +108,29 @@
   [windows-1258: cp1258 (XMLHttpRequest)]
     expected: TIMEOUT
 
-  [windows-1253: x-cp1253 (XMLHttpRequest)]
-    expected: TIMEOUT
-
   [windows-1256: cp1256 (XMLHttpRequest)]
     expected: TIMEOUT
 
-  [windows-1252: iso88591 (XMLHttpRequest)]
-    expected: TIMEOUT
-
   [windows-1254: iso-8859-9 (XMLHttpRequest)]
     expected: TIMEOUT
 
-  [windows-1252: iso_8859-1 (XMLHttpRequest)]
-    expected: TIMEOUT
-
-  [windows-1252: latin1 (XMLHttpRequest)]
-    expected: TIMEOUT
-
   [windows-1254: csisolatin5 (XMLHttpRequest)]
     expected: TIMEOUT
 
   [windows-1257: x-cp1257 (XMLHttpRequest)]
     expected: TIMEOUT
 
-  [windows-1254: cp1254 (XMLHttpRequest)]
-    expected: TIMEOUT
-
-  [windows-1253: windows-1253 (XMLHttpRequest)]
-    expected: TIMEOUT
-
-  [windows-1252: iso8859-1 (XMLHttpRequest)]
-    expected: TIMEOUT
-
   [windows-1254: iso-ir-148 (XMLHttpRequest)]
     expected: TIMEOUT
 
-  [windows-1252: l1 (XMLHttpRequest)]
-    expected: TIMEOUT
-
-  [windows-1252: iso-8859-1 (XMLHttpRequest)]
-    expected: TIMEOUT
-
-  [windows-1252: iso-ir-100 (XMLHttpRequest)]
-    expected: TIMEOUT
-
-  [windows-1252: us-ascii (XMLHttpRequest)]
-    expected: TIMEOUT
-
   [windows-1256: windows-1256 (XMLHttpRequest)]
     expected: TIMEOUT
 
+  [windows-1254: iso_8859-9 (XMLHttpRequest)]
+    expected: TIMEOUT
+
+  [windows-1257: windows-1257 (XMLHttpRequest)]
+    expected: TIMEOUT
+
 
 [single-byte-decoder.html?TextDecoder]
diff --git a/tests/wpt/metadata/fetch/content-type/response.window.js.ini b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
index 45bd4120ca4..18f786d4963 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -312,12 +312,3 @@
   [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: */* text/html]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html;x=" text/plain]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/html;charset=gbk text/plain text/html]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/non-active-document.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/non-active-document.html.ini
new file mode 100644
index 00000000000..8cc42056d34
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/non-active-document.html.ini
@@ -0,0 +1,10 @@
+[non-active-document.html]
+  [DOMParser]
+    expected: FAIL
+
+  [createHTMLDocument]
+    expected: FAIL
+
+  [<template>]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/performance-timeline/webtiming-resolution.any.js.ini b/tests/wpt/metadata/performance-timeline/webtiming-resolution.any.js.ini
index 7725b118e9d..99a24216c88 100644
--- a/tests/wpt/metadata/performance-timeline/webtiming-resolution.any.js.ini
+++ b/tests/wpt/metadata/performance-timeline/webtiming-resolution.any.js.ini
@@ -12,6 +12,3 @@
   [Verifies the resolution of entry.startTime is at least 5 microseconds.]
     expected: TIMEOUT
 
-  [Verifies the resolution of performance.now() is at least 5 microseconds.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/workers/dedicated-worker-from-blob-url.window.js.ini b/tests/wpt/metadata/workers/dedicated-worker-from-blob-url.window.js.ini
new file mode 100644
index 00000000000..9f812742af7
--- /dev/null
+++ b/tests/wpt/metadata/workers/dedicated-worker-from-blob-url.window.js.ini
@@ -0,0 +1,5 @@
+[dedicated-worker-from-blob-url.window.html]
+  expected: TIMEOUT
+  [Creating a dedicated worker from a blob URL works immediately before revoking.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/workers/semantics/multiple-workers/005.html.ini b/tests/wpt/metadata/workers/semantics/multiple-workers/005.html.ini
index f584fce5df1..268949ced5c 100644
--- a/tests/wpt/metadata/workers/semantics/multiple-workers/005.html.ini
+++ b/tests/wpt/metadata/workers/semantics/multiple-workers/005.html.ini
@@ -1,5 +1,4 @@
 [005.html]
-  expected: ERROR
   [dedicated worker in shared worker in dedicated worker]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/workers/semantics/run-a-worker/003.html.ini b/tests/wpt/metadata/workers/semantics/run-a-worker/003.html.ini
index 49f489d2a1c..d6e39444229 100644
--- a/tests/wpt/metadata/workers/semantics/run-a-worker/003.html.ini
+++ b/tests/wpt/metadata/workers/semantics/run-a-worker/003.html.ini
@@ -1,6 +1,5 @@
 [003.html]
   type: testharness
-  expected: ERROR
   [shared]
     expected: FAIL
 
diff --git a/tests/wpt/web-platform-tests/common/security-features/README.md b/tests/wpt/web-platform-tests/common/security-features/README.md
new file mode 100644
index 00000000000..45cd74ede74
--- /dev/null
+++ b/tests/wpt/web-platform-tests/common/security-features/README.md
@@ -0,0 +1,4 @@
+This directory contains the common infrastructure for the following tests.
+- referrer-policy/
+- mixed-content/
+- upgrade-insecure-requests/
diff --git a/tests/wpt/web-platform-tests/mixed-content/generic/common.js b/tests/wpt/web-platform-tests/common/security-features/resources/common.js
similarity index 98%
rename from tests/wpt/web-platform-tests/mixed-content/generic/common.js
rename to tests/wpt/web-platform-tests/common/security-features/resources/common.js
index f1574e99360..678d2a0d8fa 100644
--- a/tests/wpt/web-platform-tests/mixed-content/generic/common.js
+++ b/tests/wpt/web-platform-tests/common/security-features/resources/common.js
@@ -5,16 +5,6 @@
  *     method's JSDoc.
  */
 
-// The same content is placed as
-// - wpt/referrer-policy/generic/common.js and
-// - wpt/mixed-content/generic/common.js.
-// If you modify either one, please also update the other one.
-//
-// TODO(https://crbug.com/906850): These two files are going to be merged.
-// Currently they are duplicated only to avoid frequent mass modification
-// for each step of refactoring, as these file names are hard-coded in
-// a large number of generated test files.
-
 function timeoutPromise(t, ms) {
   return new Promise(resolve => { t.step_timeout(resolve, ms); });
 }
diff --git a/tests/wpt/web-platform-tests/css/css-position/parsing/z-index-invalid.html b/tests/wpt/web-platform-tests/css/css-position/parsing/z-index-invalid.html
index ceb7448dd0b..d89720ab146 100644
--- a/tests/wpt/web-platform-tests/css/css-position/parsing/z-index-invalid.html
+++ b/tests/wpt/web-platform-tests/css/css-position/parsing/z-index-invalid.html
@@ -14,8 +14,6 @@
 test_invalid_value("z-index", "none");
 test_invalid_value("z-index", "10px");
 test_invalid_value("z-index", "0.5");
-test_invalid_value("z-index", "calc(0.5)");
-
 test_invalid_value("z-index", "auto 123");
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-numbers.html b/tests/wpt/web-platform-tests/css/css-values/calc-numbers.html
index 995595b8a3e..e9ade71e22f 100644
--- a/tests/wpt/web-platform-tests/css/css-values/calc-numbers.html
+++ b/tests/wpt/web-platform-tests/css/css-values/calc-numbers.html
@@ -71,7 +71,7 @@ https://chromium.googlesource.com/chromium/src/+/c825d655f6aaf73484f9d56e9012793
 
     verifyComputedStyle("opacity", "initial", "calc(2 / 4)", "0.5", "testing opacity: calc(2 / 4)");
 
-    verifyComputedStyle("tab-size", "12345", "calc(2 / 4)", "0.5", "testing tab-size: calc(2 / 4)");
+    verifyComputedStyle("tab-size", "12345", "calc(2 / 4)", "1", "testing tab-size: calc(2 / 4)");
     /*
     'tab-size' accepts <number> values.
     */
diff --git a/tests/wpt/web-platform-tests/fetch/sec-metadata/img.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/sec-metadata/img.tentative.https.sub.html
index befc7a973bb..802ae25b775 100644
--- a/tests/wpt/web-platform-tests/fetch/sec-metadata/img.tentative.https.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/sec-metadata/img.tentative.https.sub.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
-<script src=/referrer-policy/generic/common.js></script>
+<script src=/common/security-features/resources/common.js></script>
 <script src=/fetch/sec-metadata/resources/helper.js></script>
 <body>
 <script>
diff --git a/tests/wpt/web-platform-tests/mathml/README.md b/tests/wpt/web-platform-tests/mathml/README.md
index 175c1813dee..9524d275e47 100644
--- a/tests/wpt/web-platform-tests/mathml/README.md
+++ b/tests/wpt/web-platform-tests/mathml/README.md
@@ -1,4 +1,4 @@
-# MathML: Tests for the MathML Core specification
+# Tests for the MathML Core specification
 
 This directory contains tests for the
 [MathML Core specification](https://mathml-refresh.github.io/mathml-core/).
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-1.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-1.html
index 848eb5b144c..6b9fb284429 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-1.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-1.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>Fraction</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS3.SSS2">
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mfrac">
 <meta name="assert" content="Verify fraction metrics for different sizes of numerator and denominator.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-bar-001.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-bar-001.html
index 6688a587b1f..d6151f62190 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-bar-001.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-bar-001.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <title>fractions bar</title>
-    <link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS3.SSS2">
+    <link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mfrac">
     <meta name="assert" content="Verifies painting of the fraction bar">
     <link rel="match" href="frac-bar-001-ref.html">
     <style type="text/css">
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-color-001.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-color-001.html
index bc61dbf51ff..d1a3e6eac41 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-color-001.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-color-001.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <title>Fraction bar color</title>
-    <link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS3.SSS2">
+    <link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mfrac">
     <meta name="assert" content="The CSS color property has an effect on the fraction bar.">
     <link rel="mismatch" href="frac-color-001-notref.html">
   </head>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-color-002.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-color-002.html
index d7cc88cb21b..597acab652c 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-color-002.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-color-002.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <title>fractions color</title>
-    <link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS3.SSS2">
+    <link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mfrac">
     <meta name="assert" content="Verifies the color attribute affects the fraction bar">
     <link rel="match" href="frac-color-002-ref.html">
   </head>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-linethickness-001.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-linethickness-001.html
index 94111174c6a..83e15c83dc0 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-linethickness-001.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-linethickness-001.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <title>fractions linethickness</title>
-    <link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS3.SSS2">
+    <link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mfrac">
     <meta name="assert" content="Verifies 'thin', 'medium', 'thick' and unitless values for the linethickness attribute of the mfrac element">
     <link rel="match" href="frac-linethickness-001-ref.html">
     <style type="text/css">
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-linethickness-002.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-linethickness-002.html
index 5bb0d6bfb9d..fd459946469 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-linethickness-002.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-linethickness-002.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <title>fractions linethickness</title>
-    <link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS3.SSS2">
+    <link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mfrac">
     <meta name="assert" content="Verifies fraction with negative, percent and named space linethickness values.">
     <link rel="match" href="frac-linethickness-002-ref.html">
     <style type="text/css">
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-linethickness-003.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-linethickness-003.html
index e535e703b52..b23cce80be4 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-linethickness-003.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-linethickness-003.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <title>fractions linethickness</title>
-    <link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS3.SSS2">
+    <link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mfrac">
     <meta name="assert" content="Verifies fraction with 0px bar.">
     <link rel="mismatch" href="frac-linethickness-003-notref.html">
   </head>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-mrow-001.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-mrow-001.html
index e5c6f525294..14476450008 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-mrow-001.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-mrow-001.html
@@ -3,7 +3,8 @@
   <head>
     <meta charset="utf-8">
     <title>Fraction mrow</title>
-    <link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS3.SSS2">
+    <link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mfrac">
+    <link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mrow">
     <meta name="assert" content="This test that <mrow> elements can be used as numerator and denominator of fractions.">
     <link rel="match" href="frac-mrow-001-ref.html">
   </head>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-numalign-denomalign-001.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-numalign-denomalign-001.html
index 61f49e2ff53..d734f1d1f33 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-numalign-denomalign-001.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-numalign-denomalign-001.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <title>Fraction numalign denomalign</title>
-    <link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS3.SSS2">
+    <link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mfrac">
     <meta name="assert" content="This fraction alignment with the numalign/denomalign attributes.">
     <link rel="match" href="frac-numalign-denomalign-001-ref.html">
   </head>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-1.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-1.html
index 543017e1900..59e335ae5a3 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-1.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-1.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>Fraction parameters</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS3.SSS2">
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mfrac">
 <meta name="assert" content="Element mfrac correctly uses the fraction parameters from the MATH table.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-2.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-2.html
index 75074875c9e..b1ee502ccda 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-2.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-2.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>Stack parameters</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS3.SSS2">
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mfrac">
 <meta name="assert" content="Element mfrac correctly uses the stack parameters from the MATH table.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-visibility-001.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-visibility-001.html
index b98f68d2a58..8fbf5ac806e 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-visibility-001.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-visibility-001.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <title>Fraction bar visibility</title>
-    <link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS3.SSS2">
+    <link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mfrac">
     <meta name="assert" content="The CSS visible property affects the rendering of the fraction bar.">
     <link rel="match" href="frac-visibility-001-ref.html">
   </head>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-axis-height-1.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-axis-height-1.html
index 7b0031ac1ed..c88484b9d59 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-axis-height-1.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-axis-height-1.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>mo axis height</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS2.SSS4">
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#tokenmo">
 <meta name="assert" content="Element mo correctly uses the axis height parameter from the MATH table.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/radicals/root-parameters-1.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/radicals/root-parameters-1.html
index 8ffcbe4a22d..51d4713d4ea 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/radicals/root-parameters-1.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/radicals/root-parameters-1.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>Radical parameters</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS3.SSS3">
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#msqrt">
 <meta name="assert" content="Elements msqrt and mroot correctly use the radical parameters from the MATH table.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-1.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-1.html
index 39768315e72..447aa66d4a3 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-1.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-1.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>Subscripts and Superscripts metrics</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS4">
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#msubmsup">
 <meta name="assert" content="Basic metrics for elements msub, msup and msubsup.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-2.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-2.html
index 26fa5de780b..9e2b6dbef79 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-2.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-2.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>Subscripts and Superscripts metrics</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS4">
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#msubmsup">
 <meta name="assert" content="Basic metrics for the mmultiscript element.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-3.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-3.html
index 231f65ab4f4..742fa8cbce6 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-3.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-3.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>Subscripts and Superscripts metrics</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS4">
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#msubmsup">
 <meta name="assert" content="Basic metrics for the mmultiscript element with many scripts.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-4.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-4.html
index c4bf4382f8e..fc70fef9b80 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-4.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-4.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>Subscripts and Superscripts metrics</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS4">
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#msubmsup">
 <meta name="assert" content="Verify metrics of scripted elements for bases of different heights.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-5.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-5.html
index 005ceea4019..a67d68d5e03 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-5.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-5.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>Subscripts and Superscripts metrics</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS4">
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#msubmsup">
 <meta name="assert" content="Verify metrics of scripted elements with tall scripts.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-parameters-1.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-parameters-1.html
index b0ebaceb435..208a0a870d6 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-parameters-1.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-parameters-1.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>Subscripts and Superscripts parameters</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS4">
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#msubmsup">
 <meta name="assert" content="Elements msub, msup, subsup and msubsup correctly use the subscript and superscript parameters from the MATH table.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-parameters-2.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-parameters-2.html
index 5ba66b86c3d..4a9db6618bc 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-parameters-2.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-parameters-2.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>Subscripts and Superscripts parameters</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS4">
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#msubmsup">
 <meta name="assert" content="Elements msub, msup, subsup and msubsup correctly use the italic correction from the MATH table.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-1.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-1.html
index 6dcdbb7b388..45367e3541b 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-1.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-1.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>Underscripts and Overscripts parameters</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS4">
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mundermover">
 <meta name="assert" content="Elements munder, mover, munderover correctly .">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-1.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-1.html
index 802293829fd..cc09abb899a 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-1.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-1.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>Underscripts and Overscripts parameters</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS4">
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mundermover">
 <meta name="assert" content="Elements munder, mover, munderover correctly use the limit parameters from the MATH table.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-2.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-2.html
index e9d6af4901e..d6d9185cc96 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-2.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-2.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>Underscripts and Overscripts parameters</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS4">
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mundermover">
 <meta name="assert" content="Elements munder, mover, munderover correctly use the stretch stack parameters from the MATH table.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-3.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-3.html
index 373d6d4d06e..23c7dfa7445 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-3.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-3.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>Underscripts and Overscripts parameters</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS4">
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mundermover">
 <meta name="assert" content="Elements munder, mover, munderover correctly use underbar/overbar and AccentBaseHeight parameters from the MATH table.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-4.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-4.html
index 3b1fa575f72..bfc3cafa913 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-4.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-4.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>Underscripts and Overscripts parameters</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS4">
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mundermover">
 <meta name="assert" content="Elements munder, mover, munderover correctly use underbar/overbar and AccentBaseHeight parameters from the MATH table.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/spaces/space-1.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/spaces/space-1.html
index cb9dd9e9acb..7bc5b8e5128 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/spaces/space-1.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/spaces/space-1.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>Space</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS2.SSS6">
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mspace">
 <meta name="assert" content="Verify mspace metrics for different values of height, depth and width">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/spaces/space-2.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/spaces/space-2.html
index 072f2bda542..5b8351a1ed0 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/spaces/space-2.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/spaces/space-2.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>space</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS2.SSS6">
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mspace">
 <link rel="match" href="space-2-ref.html"/>
 <meta name="assert" content="Verify mspace visual rendering for different values of height, depth and width">
 </head>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/tables/table-axis-height.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/tables/table-axis-height.html
index 024bdd29b11..e723008b410 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/tables/table-axis-height.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/tables/table-axis-height.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>table axis height</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS5">
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#tables">
 <meta name="assert" content="Element mtable correctly uses the axis height parameter from the MATH table.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/color-1.html b/tests/wpt/web-platform-tests/mathml/relations/css-styling/color-1.html
index 4ef821340d2..8158cec6a86 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/css-styling/color-1.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/css-styling/color-1.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>color</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1">
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssstyling">
 <link rel="match" href="color-1-ref.html"/>
 <meta name="assert" content="Verify that the color is used for text and graphical elements.">
 </head>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/display-1.html b/tests/wpt/web-platform-tests/mathml/relations/css-styling/display-1.html
index a7d6277d70d..9ae6fe0b84f 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/css-styling/display-1.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/css-styling/display-1.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>display</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1">
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssstyling">
 <link rel="match" href="display-1-ref.html"/>
 <meta name="assert" content="Verify that the 'display: none' property works on MathML elements.">
 </head>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-1.html b/tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-1.html
index 3143343da7e..ddb2173a2e0 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-1.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-1.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>displaystyle</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1">
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssstyling">
 <meta name="assert" content="Verify that the correct inheritance of the displaystyle value by measuring the size of large operators.">
 <style>
   @font-face {
diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/lengths-1.html b/tests/wpt/web-platform-tests/mathml/relations/css-styling/lengths-1.html
index e5864ccc2ac..0e3a74d46f9 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/css-styling/lengths-1.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/css-styling/lengths-1.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>MathML lengths</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1"/>
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssstyling"/>
 <link rel="match" href="lengths-1-ref.html"/>
 <meta name="assert" content="Verify whether the different units are accepted for MathML lengths.">
 <style>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/lengths-2.html b/tests/wpt/web-platform-tests/mathml/relations/css-styling/lengths-2.html
index e88111aa537..37cc640b307 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/css-styling/lengths-2.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/css-styling/lengths-2.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>MathML lengths</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1"/>
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssstyling"/>
 <link rel="match" href="lengths-2-ref.html"/>
 <meta name="assert" content="Verify whether the different namedspaces are accepted for MathML lengths.">
 <style>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/lengths-3.html b/tests/wpt/web-platform-tests/mathml/relations/css-styling/lengths-3.html
index 68a144aca69..aa38e9729de 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/css-styling/lengths-3.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/css-styling/lengths-3.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>MathML lengths</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1"/>
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssstyling"/>
 <meta name="assert" content="Verify various cases of the MathML length syntax.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-bold-fraktur.html b/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-bold-fraktur.html
index 487d61d7d85..f4141810820 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-bold-fraktur.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-bold-fraktur.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>mathvariant bold-fraktur</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1.tab2"/>
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssproperties"/>
 <link rel="match" href="mathvariant-bold-fraktur-ref.html"/>
 <meta name="assert" content="Verify that a single-char <mtext> with a bold-fraktur mathvariant is equivalent to an <mtext> with the transformed unicode character.">
 <style>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-bold-italic.html b/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-bold-italic.html
index 640baf34da8..7b53e986d4f 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-bold-italic.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-bold-italic.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>mathvariant bold-italic</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1.tab2"/>
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssproperties"/>
 <link rel="match" href="mathvariant-bold-italic-ref.html"/>
 <meta name="assert" content="Verify that a single-char <mtext> with a bold-italic mathvariant is equivalent to an <mtext> with the transformed unicode character.">
 <style>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-bold-sans-serif.html b/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-bold-sans-serif.html
index 1cab2372ba3..544db02f2ee 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-bold-sans-serif.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-bold-sans-serif.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>mathvariant bold-sans-serif</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1.tab2"/>
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssproperties"/>
 <link rel="match" href="mathvariant-bold-sans-serif-ref.html"/>
 <meta name="assert" content="Verify that a single-char <mtext> with a bold-sans-serif mathvariant is equivalent to an <mtext> with the transformed unicode character.">
 <style>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-bold-script.html b/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-bold-script.html
index 9083afa801d..dc48fbeaaf5 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-bold-script.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-bold-script.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>mathvariant bold-script</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1.tab2"/>
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssproperties"/>
 <link rel="match" href="mathvariant-bold-script-ref.html"/>
 <meta name="assert" content="Verify that a single-char <mtext> with a bold-script mathvariant is equivalent to an <mtext> with the transformed unicode character.">
 <style>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-bold.html b/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-bold.html
index b3fe917d23c..a51be7b23fd 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-bold.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-bold.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>mathvariant bold</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1.tab2"/>
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssproperties"/>
 <link rel="match" href="mathvariant-bold-ref.html"/>
 <meta name="assert" content="Verify that a single-char <mtext> with a bold mathvariant is equivalent to an <mtext> with the transformed unicode character.">
 <style>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-double-struck.html b/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-double-struck.html
index e51908e1ea3..3090fdc85c0 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-double-struck.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-double-struck.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>mathvariant double-struck</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1.tab2"/>
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssproperties"/>
 <link rel="match" href="mathvariant-double-struck-ref.html"/>
 <meta name="assert" content="Verify that a single-char <mtext> with a double-struck mathvariant is equivalent to an <mtext> with the transformed unicode character.">
 <style>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-fraktur.html b/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-fraktur.html
index 124891727cd..8bd15a558bf 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-fraktur.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-fraktur.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>mathvariant fraktur</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1.tab2"/>
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssproperties"/>
 <link rel="match" href="mathvariant-fraktur-ref.html"/>
 <meta name="assert" content="Verify that a single-char <mtext> with a fraktur mathvariant is equivalent to an <mtext> with the transformed unicode character.">
 <style>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-initial.html b/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-initial.html
index df9e0af7fc5..58751bd1266 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-initial.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-initial.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>mathvariant initial</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1.tab2"/>
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssproperties"/>
 <link rel="match" href="mathvariant-initial-ref.html"/>
 <meta name="assert" content="Verify that a single-char <mtext> with a initial mathvariant is equivalent to an <mtext> with the transformed unicode character.">
 <style>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-italic.html b/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-italic.html
index e1612a528c8..5bcbd322de8 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-italic.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-italic.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>mathvariant italic</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1.tab2"/>
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssproperties"/>
 <link rel="match" href="mathvariant-italic-ref.html"/>
 <meta name="assert" content="Verify that a single-char <mtext> with a italic mathvariant is equivalent to an <mtext> with the transformed unicode character.">
 <style>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-looped.html b/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-looped.html
index 81206e1facf..0326e86e8f4 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-looped.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-looped.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>mathvariant looped</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1.tab2"/>
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssproperties"/>
 <link rel="match" href="mathvariant-looped-ref.html"/>
 <meta name="assert" content="Verify that a single-char <mtext> with a looped mathvariant is equivalent to an <mtext> with the transformed unicode character.">
 <style>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-monospace.html b/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-monospace.html
index 8d4a4ad9234..8d9a5d3df27 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-monospace.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-monospace.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>mathvariant monospace</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1.tab2"/>
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssproperties"/>
 <link rel="match" href="mathvariant-monospace-ref.html"/>
 <meta name="assert" content="Verify that a single-char <mtext> with a monospace mathvariant is equivalent to an <mtext> with the transformed unicode character.">
 <style>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-sans-serif-bold-italic.html b/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-sans-serif-bold-italic.html
index 70207367e05..21401bc84ac 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-sans-serif-bold-italic.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-sans-serif-bold-italic.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>mathvariant sans-serif-bold-italic</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1.tab2"/>
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssproperties"/>
 <link rel="match" href="mathvariant-sans-serif-bold-italic-ref.html"/>
 <meta name="assert" content="Verify that a single-char <mtext> with a sans-serif-bold-italic mathvariant is equivalent to an <mtext> with the transformed unicode character.">
 <style>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-sans-serif-italic.html b/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-sans-serif-italic.html
index 0576236dbf9..25738723191 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-sans-serif-italic.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-sans-serif-italic.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>mathvariant sans-serif-italic</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1.tab2"/>
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssproperties"/>
 <link rel="match" href="mathvariant-sans-serif-italic-ref.html"/>
 <meta name="assert" content="Verify that a single-char <mtext> with a sans-serif-italic mathvariant is equivalent to an <mtext> with the transformed unicode character.">
 <style>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-sans-serif.html b/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-sans-serif.html
index fc880b99aff..513e0351cc3 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-sans-serif.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-sans-serif.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>mathvariant sans-serif</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1.tab2"/>
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssproperties"/>
 <link rel="match" href="mathvariant-sans-serif-ref.html"/>
 <meta name="assert" content="Verify that a single-char <mtext> with a sans-serif mathvariant is equivalent to an <mtext> with the transformed unicode character.">
 <style>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-script.html b/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-script.html
index 5725ed51033..efd3f7e8ff6 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-script.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-script.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>mathvariant script</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1.tab2"/>
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssproperties"/>
 <link rel="match" href="mathvariant-script-ref.html"/>
 <meta name="assert" content="Verify that a single-char <mtext> with a script mathvariant is equivalent to an <mtext> with the transformed unicode character.">
 <style>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-stretched.html b/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-stretched.html
index 603cfe704fd..20c5a39a83a 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-stretched.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-stretched.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>mathvariant stretched</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1.tab2"/>
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssproperties"/>
 <link rel="match" href="mathvariant-stretched-ref.html"/>
 <meta name="assert" content="Verify that a single-char <mtext> with a stretched mathvariant is equivalent to an <mtext> with the transformed unicode character.">
 <style>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-tailed.html b/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-tailed.html
index c00417d8d6a..c88d433ce5f 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-tailed.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/css-styling/mathvariant-tailed.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>mathvariant tailed</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1.tab2"/>
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssproperties"/>
 <link rel="match" href="mathvariant-tailed-ref.html"/>
 <meta name="assert" content="Verify that a single-char <mtext> with a tailed mathvariant is equivalent to an <mtext> with the transformed unicode character.">
 <style>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/visibility-1.html b/tests/wpt/web-platform-tests/mathml/relations/css-styling/visibility-1.html
index be8da3b00a2..c84f97aeeb8 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/css-styling/visibility-1.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/css-styling/visibility-1.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>visibility</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1">
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssstyling">
 <link rel="match" href="visibility-1-ref.html"/>
 <meta name="assert" content="Verify that visibility=hidden is used for text and graphical elements.">
 </head>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/class-1.html b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/class-1.html
index 654852329b4..ee4b4b50d3f 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/class-1.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/class-1.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>Class</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS1.SSS2"/>
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mathmltree"/>
 <link rel="match" href="class-1-ref.html"/>
 <meta name="assert" content="Verify that the class attribute affects CSS selectors.">
 <style>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/class-2.html b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/class-2.html
index 707500de37f..4e1ae6b7074 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/class-2.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/class-2.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>Class</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS1.SSS2">
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mathmltree">
 <meta name="assert" content="Verify whether the getElementsByClassName() works for MathML elements.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/color-attributes-1.html b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/color-attributes-1.html
index b7bdf723e38..6f9f93721a2 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/color-attributes-1.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/color-attributes-1.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>Color Attributes</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS1.SSS2"/>
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mathmltree"/>
 <meta name="assert" content="Verify that the mathcolor and mathbackground attributes are supported on the math element.">
 <link rel="match" href="color-attributes-1-ref.html"/>
 <style>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/display-1.html b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/display-1.html
index 64d862cf761..77038ee223c 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/display-1.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/display-1.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>MathML display attribute</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS1.SSS2">
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mathmltree">
 <meta name="assert" content="Verify that the display attribute on the math element is supported and impacts centering and line breaking with surrounding content.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/dynamic-1.html b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/dynamic-1.html
index ab22ad13cdb..48fdd259155 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/dynamic-1.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/dynamic-1.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>Dynamic MathML DOM</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS1.SSS1"/>
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#dom"/>
 <link rel="match" href="dynamic-1-ref.html"/>
 <meta name="assert" content="Verify that the MathML DOM tree can be modified via javascript and that the rendering is correctly updated.">
 <style>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/href-click-1.html b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/href-click-1.html
index 6164346dc07..dd6b7990a3c 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/href-click-1.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/href-click-1.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>href click</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS1.SSS2">
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mathmltree">
 <link rel="match" href="href-click-1-ref.html"/>
 <meta name="assert" content="Verify that a click on a link moves to the target.">
 <script type="text/javascript">
diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/href-click-2.html b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/href-click-2.html
index 6e5049392bd..4c5253df159 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/href-click-2.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/href-click-2.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>href click</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS1.SSS2">
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mathmltree">
 <link rel="match" href="href-click-2-ref.html"/>
 <meta name="assert" content="Verify that a click on an element bubbles to an ancestor link.">
 <script type="text/javascript">
diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/href-click-3.html b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/href-click-3.html
new file mode 100644
index 00000000000..f2863febc1f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/href-click-3.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>href click</title>
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mathmltree">
+<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>
+</head>
+<body>
+  <p>To test manually, click the blue rectangle.</p>
+  <p>
+    <math>
+      <mspace width="50px" height="10px" style="background: gray"></mspace>
+      <mspace id="target" href="javascript:handler()" width="50px" height="10px" style="background: blue"></mspace>
+      <mspace width="50px" height="10px" style="background: gray"></mspace>
+    </math>
+  </p>
+  <script>
+    var t = async_test("Click element with href");
+    function handler() { t.done(); }
+    test_driver.click(document.getElementById("target"));
+  </script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/href-manual.html b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/href-manual.html
deleted file mode 100644
index 7f24f20f4f2..00000000000
--- a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/href-manual.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<title>Manual click on a link</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS1.SSS2">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
-setup({explicit_timeout: true})
-function handler() {
-document.body.insertAdjacentHTML("beforeend",
-  "<span style='background: green; color: white;'>PASS</span>");
-}
-</script>
-</head>
-<body>
-  <p>Click on the one asterisk which is a link. If a "PASS" result appears the
-    test passes, otherwise it fails.</p>
-  <p>
-    <math style="font-size: 3em;">
-      <mtext>*****</mtext>
-      <mtext href="javascript:handler()">*</mtext>
-      <mtext>*****</mtext>
-    </math>
-  </p>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/integration-point-1.html b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/integration-point-1.html
index b3ab19c7738..3221a67503b 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/integration-point-1.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/integration-point-1.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>MathML inside foreignObject</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS1.SSS1"/>
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#dom"/>
 <link rel="match" href="integration-point-1-ref.html"/>
 <meta name="assert" content="Verify that MathML can be used inside a foreignObject element.">
 </head>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/integration-point-2.html b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/integration-point-2.html
index e970f9ec805..d42eeb03ed2 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/integration-point-2.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/integration-point-2.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>MathML as a phrasing content</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS1.SSS1"/>
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#dom"/>
 <link rel="match" href="integration-point-2-ref.html"/>
 <meta name="assert" content="Verify that MathML can be used at positions where phrasing content is accepted.">
 <style type="text/css">
diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/integration-point-3.html b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/integration-point-3.html
index 8132acc6d7c..1feb8317ff1 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/integration-point-3.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/integration-point-3.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>phrasing content inside mtext</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS1.SSS1"/>
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#dom"/>
 <link rel="match" href="integration-point-3-ref.html"/>
 <meta name="assert" content="Verify that <mtext> can contain phrasing content">
 <style type="text/css">
diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/required-extensions-1.html b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/required-extensions-1.html
index 795f516671a..3dd7f168ec1 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/required-extensions-1.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/required-extensions-1.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <title>SVG requiredExtensions</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS1">
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#dom">
 <meta name="assert" content="Verify whether the MathML namespace is recognized as a required extensions of SVG foreignObject when using the hasExtension javascript function.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/required-extensions-2.html b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/required-extensions-2.html
index b49bddaa69d..1d7af04d9ed 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/required-extensions-2.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/required-extensions-2.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>SVG requiredExtensions</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS1.SSS1"/>
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#dom"/>
 <link rel="match" href="required-extensions-2-ref.html"/>
 <meta name="assert" content="Verify that a foreignObject with MathML used as a requiredExtensions value is selected for display in a SVG switch element.">
 </head>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/unique-identifier-1.html b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/unique-identifier-1.html
index 39c49a6b56b..42a547ac218 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/unique-identifier-1.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/unique-identifier-1.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>Unique identifier</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS1.SSS2"/>
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mathmltree"/>
 <link rel="match" href="unique-identifier-1-ref.html"/>
 <meta name="assert" content="Verify that the id on a MathML element can be used as a fragment identifier in order to force initial scrolling.">
 </head>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/unique-identifier-2.html b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/unique-identifier-2.html
index 97e04a91ef1..421ad7a86d0 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/unique-identifier-2.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/unique-identifier-2.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>Unique Identifier</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS1.SSS2">
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mathmltree">
 <meta name="assert" content="Verify whether the getElementById() works for MathML elements.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/unique-identifier-3.html b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/unique-identifier-3.html
index 5d66e133ab0..c58e5026cfa 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/unique-identifier-3.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/unique-identifier-3.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>Unique Identifier</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS1.SSS2"/>
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mathmltree"/>
 <link rel="match" href="unique-identifier-3-ref.html"/>
 <meta name="assert" content="Verify that the id attribute affects CSS selectors.">
 <style>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/text-and-math/use-typo-metrics-1.html b/tests/wpt/web-platform-tests/mathml/relations/text-and-math/use-typo-metrics-1.html
index 081d66b6321..3797aef5fc0 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/text-and-math/use-typo-metrics-1.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/text-and-math/use-typo-metrics-1.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset="utf-8"/>
 <title>Open Font Format: USE_TYPO_METRICS</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS2.SSS1"/>
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#openfontformat"/>
 <link rel="match" href="use-typo-metrics-1-ref.html"/>
 <meta name="assert" content="Verify that the USE_TYPO_METRICS flag from the OS/2 table is taken into account to calculate line height.">
 <style>
diff --git a/tests/wpt/web-platform-tests/mathml/tools/mathvariant-transforms.py b/tests/wpt/web-platform-tests/mathml/tools/mathvariant-transforms.py
index 6094a74491d..ba99b595f0a 100644
--- a/tests/wpt/web-platform-tests/mathml/tools/mathvariant-transforms.py
+++ b/tests/wpt/web-platform-tests/mathml/tools/mathvariant-transforms.py
@@ -81,7 +81,7 @@ for mathvariant in mathvariantTransforms:
     reftest.write(source % mathvariant)
     reftestReference.write(source % ("%s (reference)" % mathvariant))
     source ='\
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1.tab2"/>\n\
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssproperties"/>\n\
 <link rel="match" href="mathvariant-%s-ref.html"/>\n\
 <meta name="assert" content="Verify that a single-char <mtext> with a %s mathvariant is equivalent to an <mtext> with the transformed unicode character.">\n'
     reftest.write(source % (mathvariant, mathvariant))
diff --git a/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
index ac620c1075b..cb58cbcd9c9 100644
--- a/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
index abc81b30191..815d926629c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
index 27c67b081dd..3a9ba21f0b1 100644
--- a/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
index 5fd63aa6d0b..163b1dcb612 100644
--- a/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
index e6f742213cc..4dbbc6c424a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
index 522e9442072..c3bc943e1db 100644
--- a/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 5e6b8cbe168..2c8a8cc3462 100644
--- a/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 0adc65f828b..d97aaba240a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/audio-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/audio-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/audio-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
index 283c34207bf..c04597dc71e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/audio-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/audio-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/audio-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/audio-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
index 1c65507b4ce..5b0987b3a0c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/audio-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/audio-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/audio-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/audio-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index a29157047a6..0253efc8239 100644
--- a/tests/wpt/web-platform-tests/mixed-content/audio-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/audio-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
index 15fe5d2afc1..238565ff726 100644
--- a/tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
index 2da4a2b9361..8ddc972ca6b 100644
--- a/tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
index 8b610ada7db..09ffb26b948 100644
--- a/tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
index cd4d8a52e76..b17073db2e3 100644
--- a/tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
index 20d31cf690e..6e86a30890f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
index 2ed233dc885..1aae605aa8f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index b30f28b2aab..b8ef228f54c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index c13fd88e47e..51302745cbf 100644
--- a/tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/audio-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index f0c5ae172ba..52aef359f77 100644
--- a/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index e592db53c3c..44fb9c586a2 100644
--- a/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index ee9c3c6d22d..bd211c00f5d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index e050885df3b..fbb550269e5 100644
--- a/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 369044ff69e..3392d1ba1c2 100644
--- a/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index aea84f71e64..5ea4cd97570 100644
--- a/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 83d425c58eb..2ea1e3729f7 100644
--- a/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 728e6ce73ff..89d7b827a4b 100644
--- a/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/beacon-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 4753bb3208d..ac20526946f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/beacon-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/beacon-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index e82c6cfdc18..9cf67c8e15b 100644
--- a/tests/wpt/web-platform-tests/mixed-content/beacon-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/beacon-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index d9c87b30c54..ce86221c298 100644
--- a/tests/wpt/web-platform-tests/mixed-content/beacon-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 2a4f6a5e459..e331f5772f5 100644
--- a/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 6b9d9b4f826..bb5d94c95e7 100644
--- a/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index a3f302ae60b..f3cddf53e74 100644
--- a/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 0a507e5b109..ccbaeb971ec 100644
--- a/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 5375ae50b97..6b0daa22241 100644
--- a/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index c6afc29050c..adffe353e34 100644
--- a/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 2b83f31198b..f0353c39fc7 100644
--- a/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index efc6ce6881d..2cfc38016f2 100644
--- a/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/beacon-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index a6c8fe82b59..af17b7ebd7f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 03590452099..2fff8e851a3 100644
--- a/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 3772f3b64ae..d654f3b89e0 100644
--- a/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 92d7db06f96..af004635d1d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index bd51356e2f9..bd45fa9035b 100644
--- a/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 51b84997e39..6258bc9564d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index eff7b592dbb..ce000b18cfa 100644
--- a/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 1b7257dc861..84342c02890 100644
--- a/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index b3bb1383564..d77d38640b9 100644
--- a/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index eb3b0a9eb51..43347773036 100644
--- a/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 9c7b7535400..1de38b5a7a1 100644
--- a/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 61288bb8c77..6b811116fbd 100644
--- a/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 4b326660bbb..35a7e584f68 100644
--- a/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 031a3728534..e69505d7f07 100644
--- a/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 253234f3b3e..b56a6baa116 100644
--- a/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 61ef1c2d3bc..4ae4cb83ae3 100644
--- a/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index d4dd6daccf5..919e992cc55 100644
--- a/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 9b28a62a9a9..e56db94fa07 100644
--- a/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index c1496d03802..e5110a44c39 100644
--- a/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 012bd3540a1..a84f29e51b6 100644
--- a/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 54fbe3a8477..4de2f75f022 100644
--- a/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index f9555455807..3e0fb529f04 100644
--- a/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index c03b96f01fa..542a1866c79 100644
--- a/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index a7ce2a53055..39ccde3c154 100644
--- a/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 1eec54d3b2c..4c9d38ea192 100644
--- a/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 260fb14b042..fa4e8f2ac31 100644
--- a/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 9b18ebb78b2..f05c4b9e694 100644
--- a/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/fetch-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/fetch-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/fetch-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index a1b37ef1ee7..a1e69a67b96 100644
--- a/tests/wpt/web-platform-tests/mixed-content/fetch-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/fetch-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/fetch-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/fetch-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 0fb506de19f..b9599b28fcc 100644
--- a/tests/wpt/web-platform-tests/mixed-content/fetch-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/fetch-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/fetch-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/fetch-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 825fb2441b4..256fca63411 100644
--- a/tests/wpt/web-platform-tests/mixed-content/fetch-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/fetch-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index f35fd03dae8..1ebe92316fb 100644
--- a/tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 3b2d158d631..250bbd4f2e7 100644
--- a/tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 24a1e8671d8..98b12d213e1 100644
--- a/tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index d7aa3899bfa..a63a7940c0a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 55c768525d1..43a6499938c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 13de80df73c..b1534c87776 100644
--- a/tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 9045019de11..bbc089ba473 100644
--- a/tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index d4b8292af32..704042109cc 100644
--- a/tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/fetch-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/generic/template/test.debug.html.template b/tests/wpt/web-platform-tests/mixed-content/generic/template/test.debug.html.template
index 013bb625027..77f62ef1da3 100644
--- a/tests/wpt/web-platform-tests/mixed-content/generic/template/test.debug.html.template
+++ b/tests/wpt/web-platform-tests/mixed-content/generic/template/test.debug.html.template
@@ -9,7 +9,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for mixed-content tests. -->
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <!-- The original specification JSON for validating the scenario. -->
     <script src="/mixed-content/spec_json.js"></script>
     <!-- Internal checking of the tests -->
diff --git a/tests/wpt/web-platform-tests/mixed-content/generic/template/test.release.html.template b/tests/wpt/web-platform-tests/mixed-content/generic/template/test.release.html.template
index ca77389cc68..188e32fde4b 100644
--- a/tests/wpt/web-platform-tests/mixed-content/generic/template/test.release.html.template
+++ b/tests/wpt/web-platform-tests/mixed-content/generic/template/test.release.html.template
@@ -10,7 +10,7 @@
     <meta name="assert" content="%(test_description)s">%(meta_opt_in)s
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
index 1816b4231bd..9b3b46ff012 100644
--- a/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
index 509fc34750f..f39f0c69653 100644
--- a/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
index 61baeee7944..149d0dc524a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
index ad615e9b23f..d37a441016d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
index b6f92431a3a..49d3813b049 100644
--- a/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
index 580f4b5492f..9787e9c75bf 100644
--- a/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 77adba6442a..740e202ce30 100644
--- a/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index b08d413e8eb..d45384ace05 100644
--- a/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/img-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/img-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/img-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
index 684d2449a4e..b1e4649e008 100644
--- a/tests/wpt/web-platform-tests/mixed-content/img-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/img-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/img-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/img-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
index b05dff3b33d..3c0bce6b72d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/img-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/img-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/img-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/img-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index e4ac20f4f08..cc943fd1b50 100644
--- a/tests/wpt/web-platform-tests/mixed-content/img-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/img-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
index 5a7bdc3b538..8cc7a82c3e8 100644
--- a/tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
index 6c0a9f5e686..fae9b1e4d70 100644
--- a/tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
index c9ffbfd0c70..9273ac43c49 100644
--- a/tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
index aab662fc3ab..030de7033a7 100644
--- a/tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
index 6f0a8fdedef..c9c20812db2 100644
--- a/tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
index f55cce43713..dddd339fb03 100644
--- a/tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 54bb60accf1..3e78d29d5aa 100644
--- a/tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 26d7d2390ae..5d5e55ed578 100644
--- a/tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/img-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 7376626e2e1..482accfd344 100644
--- a/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index fc123d9638d..4db97176aa9 100644
--- a/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index f7fd32cbf9b..90aa192e605 100644
--- a/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index b93d1778422..3a8c8cfa983 100644
--- a/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index b23f9f0eb68..a44839fb874 100644
--- a/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 122ee404dc7..7a8949053ef 100644
--- a/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 606887e3dd5..585b54c738b 100644
--- a/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 2f4f750de9f..d6166d041af 100644
--- a/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/link-css-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 191b4a9ea66..9b6036b96a5 100644
--- a/tests/wpt/web-platform-tests/mixed-content/link-css-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/link-css-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 5e71b99d4c6..dc18ca79c36 100644
--- a/tests/wpt/web-platform-tests/mixed-content/link-css-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/link-css-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 869c05abeca..5e74a770db8 100644
--- a/tests/wpt/web-platform-tests/mixed-content/link-css-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 13c536f3eb5..e6b3dedf6a9 100644
--- a/tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index e941030043e..88f21d4bbff 100644
--- a/tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index c9efe54e44a..ebd1747a8ce 100644
--- a/tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 11d8f4877a7..76b18d6f7e0 100644
--- a/tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index ce383d9aacb..4449e58c1b6 100644
--- a/tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 67b58e0096c..1000359b175 100644
--- a/tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 7d620f8da93..e07e2fa5b41 100644
--- a/tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index f6d23405dd5..cbbfa0723d4 100644
--- a/tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/link-css-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index bcb7abb7c0e..9f69cae481f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 3c6de84218b..883cfde572e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 1fe904f138a..13e9b46cac4 100644
--- a/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 2db9724a2eb..a806be7e0f1 100644
--- a/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index ddad38792d4..69cd3b29d5c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index d2d15b98dce..f337745eb43 100644
--- a/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index a047941dcd4..9e0ab39c5a9 100644
--- a/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index bd24109afe2..819b543948d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 16c1e07a50e..a9e57c17ce1 100644
--- a/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index f3adaf6cec9..f2025dcee2a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 71ef6d359d1..b787497cf92 100644
--- a/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 6db10199649..9317d5c73a7 100644
--- a/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 5c41820d55d..8dc0000ba77 100644
--- a/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index afa70d38e96..64042683224 100644
--- a/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 00241b622cd..1655a2eaec6 100644
--- a/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index f1be54283e0..a47869e4304 100644
--- a/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index bc14146a24b..1359609a602 100644
--- a/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index c3ea33fdb70..853bd279af5 100644
--- a/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 4c591115391..f450941427d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index ae4ebff13ce..0d0e79c5624 100644
--- a/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index aa3fc778fc4..8f09c46e61b 100644
--- a/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index c9d2d22c8a0..77e7aada13c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 5202090bc56..adb8f0711bc 100644
--- a/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 2013b19c6b6..39560f5eb4a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index fbe8606d656..2a3781149b6 100644
--- a/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index c6c56e0c9f4..5b8b9ef9570 100644
--- a/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index c62ca1208da..ce6e2072528 100644
--- a/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 349a3731fca..5055e600a12 100644
--- a/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 6536bef9032..f2e537b7854 100644
--- a/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 9632f6963f3..acb39ccf495 100644
--- a/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index fde3d3ab49c..9adb36a3c7c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 4fe1a650df7..4124504484e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 93d5a1b631b..20133bca312 100644
--- a/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 2810c3c159b..29010dfc2b4 100644
--- a/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index afb1ac17cec..fb989ecc2bd 100644
--- a/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index e54f7ba9618..c4a8417f072 100644
--- a/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 7791db2e61f..1f734b4618d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index d50981f6dad..4c171710212 100644
--- a/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/module-data-worker-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 65c121204d4..48bd7e27934 100644
--- a/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 29d56963e79..905108ca2f9 100644
--- a/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 25bbcf1e9e8..9992cf98607 100644
--- a/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 5d34ff67cc5..895b8758703 100644
--- a/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 347c57cb3a6..ed488953ce2 100644
--- a/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index ab991d2c8d2..4dacb3a7c43 100644
--- a/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 775fcabb1be..e7e01df2982 100644
--- a/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 6a9a6437c8d..1adac7769cd 100644
--- a/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index e873d4a73d1..bff5398b263 100644
--- a/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index ee6c6da0c3f..ac623c71a45 100644
--- a/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 2393202ae06..ff7b496a197 100644
--- a/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 64f777ea3d0..fd30ae973e5 100644
--- a/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 4950c32ae14..2fa81d5b8a4 100644
--- a/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 7301b826e84..7a9a84582d6 100644
--- a/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index b9a59ad4934..4f9e9791771 100644
--- a/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index f1d99109db6..8d83c1f93ee 100644
--- a/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 17e86bac43a..5719538c0fd 100644
--- a/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 744ad87bb24..16c4d61aaaf 100644
--- a/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index e04e9baeed8..91db1463370 100644
--- a/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/module-worker-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 8ebd99b0118..5e710368a6e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index b7743daa64c..242569e5bcc 100644
--- a/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 3fe162a2f7c..d2fe8eaa661 100644
--- a/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 4c43f3aea64..4959d44533e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 27da8b421be..45d70e8185c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 01df78229ff..119dda323ef 100644
--- a/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index d1be723f15d..01cc0998c0e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 3f8ec136a1c..72275f99462 100644
--- a/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/object-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/object-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/object-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index ee5cfea7192..4cba2b547fa 100644
--- a/tests/wpt/web-platform-tests/mixed-content/object-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/object-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/object-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/object-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 28fdc6f0887..ea3e1dc4e76 100644
--- a/tests/wpt/web-platform-tests/mixed-content/object-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/object-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/object-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/object-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 662ac192a88..d8c0fda2bef 100644
--- a/tests/wpt/web-platform-tests/mixed-content/object-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/object-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 23e6badf7ea..5ba57440bff 100644
--- a/tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 482024535f9..414ed3a0e5f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index f91df5037e7..a9a07e7c689 100644
--- a/tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 190b66b0d62..36ee1133c4c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index c03d5036a38..32bf8286926 100644
--- a/tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index d9a16660981..57d8e55701f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index ebfb5195eb1..1fc9bd34247 100644
--- a/tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index f5ffcf3a8b2..66e4183460a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/object-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 6f71158c216..f4284d2710d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 48012dfe550..81c5e313e1f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index b76c48a658a..423d55b6b9e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 27e971ac49c..265c22fef5c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 0fe505a4b05..e78b35af9b7 100644
--- a/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index d066d7f4af1..e71eca9f521 100644
--- a/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 3ae09e2e3f3..60bb06333c8 100644
--- a/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 883c0bbdf78..082a5d02917 100644
--- a/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/picture-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/picture-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/picture-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index abe50087f63..d240025aaaa 100644
--- a/tests/wpt/web-platform-tests/mixed-content/picture-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/picture-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/picture-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/picture-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 9c484e398a2..545858eb23d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/picture-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/picture-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/picture-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/picture-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 0d846777fab..1722e18842a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/picture-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/picture-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 09fadc8d3fb..07b58b5e8f1 100644
--- a/tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 63505012881..7cd70053230 100644
--- a/tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index c3bedd387d7..5109e5a031d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 0b2a8c8ff5a..1005c627f67 100644
--- a/tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 532c97bf066..98bf20f362e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 662fc90485a..a5b1bedb767 100644
--- a/tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 57efd6f5ec4..76580a4deba 100644
--- a/tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index e3113a84c9f..7e6f59e33ad 100644
--- a/tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/picture-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 61f10dfbff3..a1c58ee77b0 100644
--- a/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 69210c6061d..53729bbbafd 100644
--- a/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index a2201a2132a..3f6d76717c0 100644
--- a/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 011e515da17..c89c2a58c79 100644
--- a/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 5c8d860a695..84d81d60366 100644
--- a/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 123e53d2027..83110755a63 100644
--- a/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index cb3528e03c9..e7b7bd4e5c8 100644
--- a/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 7bffa299c5d..1aaa44590e8 100644
--- a/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/script-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/script-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/script-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 7e9a2395a3c..bcb3b05739d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/script-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/script-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/script-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/script-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 44b4795c91e..c6af6e42c53 100644
--- a/tests/wpt/web-platform-tests/mixed-content/script-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/script-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/script-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/script-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 0d0eec01c36..df5aa5228da 100644
--- a/tests/wpt/web-platform-tests/mixed-content/script-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/script-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 4c375acd157..d0048db3055 100644
--- a/tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 21d15255719..a1519d9c2ac 100644
--- a/tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index cd56451c5e4..9e46278e860 100644
--- a/tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index cc1c051a364..d92025d3d87 100644
--- a/tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 23efca0a54c..d84c70e54e3 100644
--- a/tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 69e151519bb..d4ee7953bf7 100644
--- a/tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 9dc0bb122c4..d8b2161b7c8 100644
--- a/tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index bad7e7f2104..7b4423bee35 100644
--- a/tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/script-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
index 029d34c4f41..97d76b32ffe 100644
--- a/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
index c72ca267fcb..6d2d972ef94 100644
--- a/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
index b50a7b70a01..912f5901564 100644
--- a/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
index 8b64104bd2f..a0957ec2cfc 100644
--- a/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
index abe3385b06a..a01f53a0571 100644
--- a/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
index 78d9f8d5d4e..fb3b6344bc4 100644
--- a/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index ce72664408e..8bd2c9f6021 100644
--- a/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index b9ddc78ff18..94a5e8e6401 100644
--- a/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/video-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/video-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/video-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
index a181ecd388a..5910d534508 100644
--- a/tests/wpt/web-platform-tests/mixed-content/video-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/video-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/video-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/video-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
index 05f1890c98d..44fb6020829 100644
--- a/tests/wpt/web-platform-tests/mixed-content/video-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/video-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/video-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/video-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index cf84396315e..1cd1855b2ac 100644
--- a/tests/wpt/web-platform-tests/mixed-content/video-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/video-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
index 561a2f7c1b5..48687c66ba9 100644
--- a/tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
index e02134b4acf..e39519b4bc8 100644
--- a/tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
index f90575c137a..1075bb4110f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
index 68bfc2b84a8..e97fcd5278a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
index 2e5eff5a74e..e74ae75d66f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html b/tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
index 8c5bd7b0806..eaaf53bc36a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index f044783e62b..399566ff204 100644
--- a/tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index fd0a1f923a7..2b51bd4cf89 100644
--- a/tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/video-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html
index 5f4facece9f..4f52562fa8f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
index 0d700202fcf..20fc9b91116 100644
--- a/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html
index 22e930e20b4..3a67d126dc6 100644
--- a/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html
index 972d7f3d349..0b1702a56e9 100644
--- a/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
index 66b20800ffa..087f54d287c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html
index 664acc6fa8e..2491c538418 100644
--- a/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html
index ff33c35d169..727cc350f4a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html
index dabaab28cd6..5a10108a5d8 100644
--- a/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/websocket-request/http-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/websocket-request/meta-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/websocket-request/meta-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
index 1bc4b11d9a7..f2e26424982 100644
--- a/tests/wpt/web-platform-tests/mixed-content/websocket-request/meta-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/websocket-request/meta-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/websocket-request/meta-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/websocket-request/meta-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
index a3cb304e034..e9442970783 100644
--- a/tests/wpt/web-platform-tests/mixed-content/websocket-request/meta-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/websocket-request/meta-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/websocket-request/meta-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/websocket-request/meta-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html
index f1cfed1984c..45bf7d3bb21 100644
--- a/tests/wpt/web-platform-tests/mixed-content/websocket-request/meta-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/websocket-request/meta-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html
index ef959099b11..049e61b1ded 100644
--- a/tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
index 9a344137bb9..2a282084a1d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html
index fad857a6ee1..099056fb25b 100644
--- a/tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html
index cc63690459a..c24e1d7ac99 100644
--- a/tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
index 4b7ae62fd4b..83120667aff 100644
--- a/tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html
index 278819b938f..5fb923f2b5e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html
index 52684b1a501..09fd3e4259e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html
index a32429b8866..4e104fb8519 100644
--- a/tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/websocket-request/no-opt-in/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 8fc3283a0ac..3b1be17ec59 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 21f63bd7307..e5c5a860341 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index d4c437147aa..f318d00b762 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 735c267a88a..1e133c2a8ed 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index d70b8576897..1d7c1ec1c4d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index bf77ac6d77e..3e31998cb63 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 1a9053e4c3e..2fa9e6b3f6d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 0488b133755..c4651834b12 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worker-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worker-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worker-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 63ba9045403..140133fcdfe 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worker-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worker-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worker-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worker-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 22e7c6eac28..f664dfc3007 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worker-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worker-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worker-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worker-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index e5bf5ce95a8..f639f30ee34 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worker-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worker-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 4feea4b7dc0..7a8df78728c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 2d4f15b13e2..99162059a7e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index a6782c7e5b8..5b69f159483 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 065ff5ba526..f6bad6b76b7 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 3cd8a67482c..e2f8a28561a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 3b3e17c2777..54b34e77788 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index d720fc4fa99..a277471b5d0 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index bd69a14a9de..db091027140 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worker-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 99c2795851f..1db0a1e4436 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index ea193eadbb0..30cf903d12f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index f410e1cf8e8..8840673a630 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index cfda98f785f..fcb3ed1f3af 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index a85242a8334..e97d9ed9052 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 48d74bc3081..b9e6af0d6b3 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 7d0cdae613e..79ace779293 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 94f97850ea7..3a41ecf140b 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 1a895d0fd70..9bf5482526a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index ab90656e54c..a7d02739da2 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 113460364e3..2e7aa070990 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index a636eef658b..4a97df5b5ba 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 8aa7d05881f..0358e5fb6be 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 5ef502f0c29..d59023de384 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 34b6be42bb5..13e9150460b 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 1586df97fc5..84b53d8f1ba 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 73f621edff1..4b6dc464b46 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 2b32f598852..ad35a459266 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 35995bb976f..2ca7129d2ee 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index c858da0c4b6..3ca94248773 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 0387b165e1b..0ebfe517fd1 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 34a4e1e532a..85f339a461f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index b683d8267eb..2ff42bf27e7 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 5655510609f..3e0fbbc9585 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 0ccf4bc4229..b12e3d7fbe2 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 7c54048c0a9..3877b4adf8c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 2d3eb78d618..1aeee584cff 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 989f1ad5078..f96210c1198 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 46bca306999..86e8c0c4b5e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 313f7755b48..ef94f6df86a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 033b1d9798f..557f3f78e3b 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index c4d4629746b..f9dd0619e04 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 90ad6006617..f6e6751ed48 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 5111667254f..2b1b0b2d913 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 7d54c015391..159329a1ff0 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index e1a0ac5a997..0e045e1bce0 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 812cec20e18..6658abc73ae 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index a3611976131..32ac8f2c932 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 81e57b110c0..189a25b2e6d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index ec537f57923..3144aba7d7a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 0b8ddb9cc92..6e5dcc59a86 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index d2ab9e1e325..d78de561bb0 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index e3b0cb81179..a1f5f72bec6 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 063c7b77c21..85d1a1e9545 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 802b84c1899..00b5d6f7eb2 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 7e40482d496..9cae068af51 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 1c77b65b666..c4846185f22 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index c5ec8343c90..5f10d56162a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 918aec37a41..502407cba75 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index b801db0de2e..c0f2fc7a176 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 65d7c00892c..7b6e331e2b1 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index bd3afe9856e..94cfb964c6d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 45759c1b317..49b910332a5 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 5d2f67b7fff..6f8ea015117 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index fbf57e8b647..1b18de0c696 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index e297efb9433..dfdbae7cb0c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 6e1e6cba39c..c6ce305c5fa 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 68329ff582e..cba9bdc351c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 862abf012b5..13eb20d20b4 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 9e8ca3cd573..4df48a8f80f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 341e9584d94..9c796352a1d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 0bf45c0d511..176da0f4d48 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 017a3888483..3ba97cc4af3 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index c7f37dee35c..66857b1c235 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 84c5ae0d05a..e0b664bca09 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index b7f5cdc9c9c..6f688d70dd9 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index adb418f61a9..63bb81d1b8a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index ce31e04d1b1..e9b11532395 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 8197d981d8b..6d72fbe85c2 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 60a5b9ec6e2..ddb4146a26f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 035fe3bb0b1..f2e6058f0f2 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 56c5e14673e..970723e66de 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index f1e134adbed..49011184e6c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index ce5d3e1c065..b0ea6b38a56 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 5c123ed6cb1..4b1452782ea 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 06aadc3c3ce..4737340b701 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index bcc60543ae0..7e1db35ba00 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index e56443cb86b..617237da801 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 40569b7188d..3a90c1da480 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 17226d67459..3f2b4aa46c1 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 034c2f727de..f6201721afc 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 1ecd9d94e02..c96d2d4b267 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index a60c79d490f..685bd1e4a13 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 88efeaf0945..aaa62a95e80 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 2e33579ee35..37d3c51754a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 7f1353c5477..8c1cecce2f9 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 5cc77dd2e6b..c766c5ed130 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 6af86dd96b3..408d01cdf7c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index e6a9c4c426d..bd5f1b0563e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 400622006fc..006ee9d12bb 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index b4be536c923..905856f6cee 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 0d7b7210a99..c031756b389 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 708c0a5d75f..c8c56c457f7 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 2414d5f321c..a86f3b4429d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index f0fa9aa6076..e0a437e26d6 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 440630b5c29..89b2402ec54 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 51cf26bcc86..5b01dbc1b70 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index d38c0259e95..55d23f9724e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index f32666f28ac..64d45885ecd 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 016ea765f53..27bb9376848 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 47ba0d80674..2bd8a109a02 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 6b339518948..8fec9a030fe 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 349d1ae1e63..4bd82770394 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index ba7834dff56..cc5688915fe 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index d1514320a5c..f50bb1848c2 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 42b9de520ea..785bc579c25 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 3a03aeae626..2918d12dc19 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index c087917e88d..63ce10a6b6c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index f4192c219a4..333b26e8db5 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 82713253b04..29edc68057d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 35ad440c528..12ea7f2dbdf 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 58227b988f3..ede2b9eb18f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index e43a2542b1b..b35999d891a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 4e0db8fc448..5ad4fdc5cff 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 84345fb74a5..94dc4faaa08 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 52595a63b0f..16377236490 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 0844824ea72..c0df2746529 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 8b5df2cacc7..2e99652ac62 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index b03a99c5e6a..202b22c4be5 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 7180a72690d..3e4c570310d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index f228ae5dc8e..df15dd97a6c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index ca0a9f47db3..23668777f15 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 7d38ae9f8d4..a8b19ae720f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index c8bb0051668..cfa30e472c2 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index e97507d5749..1c8391eb4cf 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index a9b350b5c9d..d33c7928abb 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 81db7898f32..939f20f9dfd 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 999411c6297..be7e4ce7cce 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index de2d0031756..f69486e70eb 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 453c5cb95d0..806b2ae13bb 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index fbf362903e1..f0b30f8f3ee 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index a34698e9f7a..9ff4c3ce1cf 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index bbd268ab31c..0edffdf2502 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 45472963891..ab3439a3bd8 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 6d519a352c4..3d17e69cb37 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 2a317beae4e..c060ab33849 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 44d4b3d8852..22760d90a95 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index f1af455623f..9f3bc48ef90 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 6eb6e95ef68..95ef4692ed9 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 9b5656b9613..145cb040149 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 4fbf140e660..911051752d5 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index d1b9d5d6139..82434165647 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index c328f8fe8a5..e8d26e88be1 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index dc7cd63dcea..9db55dc5354 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 1c7d29835bb..4412335c444 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index cea0a88bacb..7f7d6b2b477 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 224d7c767b5..97664540149 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index b1432e78ac2..196f60ff46e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index ce845cb3d52..b2bf5c412b6 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 1e9acdf88e2..b931d339fda 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 0ff9576d603..0eeba32e213 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index d0e64b29b2d..1da3a8484ec 100644
--- a/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 314f0978905..f70e0d71415 100644
--- a/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index d44e65bcd19..be74d7f085c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 973db8006fc..39f508c2b16 100644
--- a/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index f8509416232..703e0af2959 100644
--- a/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 0dd9e88e885..a1323d428a3 100644
--- a/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index eb7f7ea2c73..0aa1bf3f82f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 23f0a1fc89d..61fe95dbd29 100644
--- a/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 7baa3e54a98..8a0c5b1a51f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/xhr-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/xhr-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/xhr-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index cf95677c7f6..df3f8cc6f62 100644
--- a/tests/wpt/web-platform-tests/mixed-content/xhr-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/xhr-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/xhr-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/xhr-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 80a633ab22f..74261daf151 100644
--- a/tests/wpt/web-platform-tests/mixed-content/xhr-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/xhr-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/xhr-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/xhr-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index ebbc9ec0c67..45cd5ea8423 100644
--- a/tests/wpt/web-platform-tests/mixed-content/xhr-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/xhr-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index b2ee591a74a..ed8f550d895 100644
--- a/tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index e49db79f3d3..c14bc41c79e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index ffd8aeb9c0b..1061f61fe38 100644
--- a/tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 897354a798a..18a5a3e8b4d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index ee787d05aa3..d47797aca23 100644
--- a/tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 9a9085b86eb..ff17fa2abbb 100644
--- a/tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 9da0d9f98ec..76d5442339d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index b0fff36eb94..e6eba571c0e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/xhr-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/mixed-content/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/README.md b/tests/wpt/web-platform-tests/referrer-policy/README.md
index a4cc29b3851..c4694dc3728 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/README.md
+++ b/tests/wpt/web-platform-tests/referrer-policy/README.md
@@ -96,7 +96,7 @@ The ```./generic/tools/clean.py``` utility will only work if there is a valid ``
 
 ## Updating the tests
 
-The main test logic lives in ```./generic/referrer-policy-test-case.js``` with helper functions defined in ```./generic/common.js``` so you should probably start there.
+The main test logic lives in ```./generic/referrer-policy-test-case.js``` with helper functions defined in ```./common/security-features/resources/common.js``` so you should probably start there.
 
 For updating the test suite you will most likely do **a subset** of the following:
 
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/external-import-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/external-import-stylesheet.html
index 6be475e98bc..9245ff39c6e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/external-import-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/external-import-stylesheet.html
@@ -6,7 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
     <meta name="referrer" content="origin">
   </head>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/internal-import-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/internal-import-stylesheet.html
index 37370fdd371..c25b99926a0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/internal-import-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/internal-import-stylesheet.html
@@ -6,7 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
     <meta name="referrer" content="never">
   </head>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/processing-instruction.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/processing-instruction.html
index 53622341774..36d8bbc0216 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/processing-instruction.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/processing-instruction.html
@@ -6,7 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
     <meta name="referrer" content="origin">
   </head>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/external-import-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/external-import-stylesheet.html
index 300960d2944..6bd0554ccdf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/external-import-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/external-import-stylesheet.html
@@ -6,7 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
     <meta name="referrer" content="never">
   </head>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/external-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/external-stylesheet.html
index 45da018cb02..8773664625c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/external-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/external-stylesheet.html
@@ -6,7 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
     <meta name="referrer" content="never">
   </head>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/internal-import-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/internal-import-stylesheet.html
index dd06b7d7bb1..6dcf6be3e7d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/internal-import-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/internal-import-stylesheet.html
@@ -6,7 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
     <meta name="referrer" content="origin">
   </head>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/internal-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/internal-stylesheet.html
index a0a9067b3b8..0d54bb766f7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/internal-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/internal-stylesheet.html
@@ -6,7 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
     <meta name="referrer" content="origin">
   </head>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/processing-instruction.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/processing-instruction.html
index a9d79a33b08..26203a82268 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/processing-instruction.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/processing-instruction.html
@@ -6,7 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
     <meta name="referrer" content="never">
   </head>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/external-import-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/external-import-stylesheet.html
index 2a7ac43a754..7c5a8c3d709 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/external-import-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/external-import-stylesheet.html
@@ -6,7 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
     <meta name="referrer" content="never">
   </head>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/external-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/external-stylesheet.html
index c763ecbcff7..72a807bec6b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/external-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/external-stylesheet.html
@@ -6,7 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
     <meta name="referrer" content="never">
   </head>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/inline-style.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/inline-style.html
index da571afbbc8..7e3d8879a4a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/inline-style.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/inline-style.html
@@ -6,7 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
     <meta name="referrer" content="origin">
   </head>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/internal-import-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/internal-import-stylesheet.html
index e320e063f2d..e94218d419e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/internal-import-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/internal-import-stylesheet.html
@@ -6,7 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
     <meta name="referrer" content="origin">
   </head>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/internal-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/internal-stylesheet.html
index 3e2fc109936..a6107cb3a99 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/internal-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/internal-stylesheet.html
@@ -6,7 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
     <meta name="referrer" content="origin">
   </head>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/presentation-attribute.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/presentation-attribute.html
index e810df54b82..ee70f15885c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/presentation-attribute.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/presentation-attribute.html
@@ -6,7 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
     <meta name="referrer" content="origin">
   </head>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/processing-instruction.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/processing-instruction.html
index e5a1e20af72..c2b31be8899 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/processing-instruction.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/processing-instruction.html
@@ -6,7 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
     <meta name="referrer" content="never">
   </head>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/external-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/external-stylesheet.html
index dfa6fd073b9..54ee36ce30b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/external-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/external-stylesheet.html
@@ -6,7 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
     <!-- Helper functions for referrer-policy css tests. -->
     <script src="/referrer-policy/css-integration/css-test-helper.js"></script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/inline-style.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/inline-style.html
index fd6e4baeae5..59fb4025f3b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/inline-style.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/inline-style.html
@@ -6,7 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
     <!-- Helper functions for referrer-policy css tests. -->
     <script src="/referrer-policy/css-integration/css-test-helper.js"></script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/internal-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/internal-stylesheet.html
index 228de6d700b..82d75665ea1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/internal-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/internal-stylesheet.html
@@ -6,7 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
     <!-- Helper functions for referrer-policy css tests. -->
     <script src="/referrer-policy/css-integration/css-test-helper.js"></script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/presentation-attribute.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/presentation-attribute.html
index 65bb642f5bf..8e616416380 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/presentation-attribute.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/presentation-attribute.html
@@ -7,7 +7,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
     <!-- Helper functions for referrer-policy css tests. -->
     <script src="/referrer-policy/css-integration/css-test-helper.js"></script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/processing-instruction.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/processing-instruction.html
index c0e8d4bf816..99ec1ae6aeb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/processing-instruction.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/processing-instruction.html
@@ -7,7 +7,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
     <!-- Helper functions for referrer-policy css tests. -->
     <script src="/referrer-policy/css-integration/css-test-helper.js"></script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/common.js b/tests/wpt/web-platform-tests/referrer-policy/generic/common.js
deleted file mode 100644
index f1574e99360..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/common.js
+++ /dev/null
@@ -1,699 +0,0 @@
-/**
- * @fileoverview Utilities for mixed-content in Web Platform Tests.
- * @author burnik@google.com (Kristijan Burnik)
- * Disclaimer: Some methods of other authors are annotated in the corresponding
- *     method's JSDoc.
- */
-
-// The same content is placed as
-// - wpt/referrer-policy/generic/common.js and
-// - wpt/mixed-content/generic/common.js.
-// If you modify either one, please also update the other one.
-//
-// TODO(https://crbug.com/906850): These two files are going to be merged.
-// Currently they are duplicated only to avoid frequent mass modification
-// for each step of refactoring, as these file names are hard-coded in
-// a large number of generated test files.
-
-function timeoutPromise(t, ms) {
-  return new Promise(resolve => { t.step_timeout(resolve, ms); });
-}
-
-/**
- * Normalizes the target port for use in a URL. For default ports, this is the
- *     empty string (omitted port), otherwise it's a colon followed by the port
- *     number. Ports 80, 443 and an empty string are regarded as default ports.
- * @param {number} targetPort The port to use
- * @return {string} The port portion for using as part of a URL.
- */
-function getNormalizedPort(targetPort) {
-  return ([80, 443, ""].indexOf(targetPort) >= 0) ? "" : ":" + targetPort;
-}
-
-/**
- * Creates a GUID.
- *     See: https://en.wikipedia.org/wiki/Globally_unique_identifier
- *     Original author: broofa (http://www.broofa.com/)
- *     Sourced from: http://stackoverflow.com/a/2117523/4949715
- * @return {string} A pseudo-random GUID.
- */
-function guid() {
-  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
-    var r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8);
-    return v.toString(16);
-  });
-}
-
-/**
- * Initiates a new XHR via GET.
- * @param {string} url The endpoint URL for the XHR.
- * @param {string} responseType Optional - how should the response be parsed.
- *     Default is "json".
- *     See: https://xhr.spec.whatwg.org/#dom-xmlhttprequest-responsetype
- * @return {Promise} A promise wrapping the success and error events.
- */
-function xhrRequest(url, responseType) {
-  return new Promise(function(resolve, reject) {
-    var xhr = new XMLHttpRequest();
-    xhr.open('GET', url, true);
-    xhr.responseType = responseType || "json";
-
-    xhr.addEventListener("error", function() {
-      reject(Error("Network Error"));
-    });
-
-    xhr.addEventListener("load", function() {
-      if (xhr.status != 200)
-        reject(Error(xhr.statusText));
-      else
-        resolve(xhr.response);
-    });
-
-    xhr.send();
-  });
-}
-
-/**
- * Sets attributes on a given DOM element.
- * @param {DOMElement} element The element on which to set the attributes.
- * @param {object} An object with keys (serving as attribute names) and values.
- */
-function setAttributes(el, attrs) {
-  attrs = attrs || {}
-  for (var attr in attrs)
-    el.setAttribute(attr, attrs[attr]);
-}
-
-/**
- * Binds to success and error events of an object wrapping them into a promise
- *     available through {@code element.eventPromise}. The success event
- *     resolves and error event rejects.
- * This method adds event listeners, and then removes all the added listeners
- * when one of listened event is fired.
- * @param {object} element An object supporting events on which to bind the
- *     promise.
- * @param {string} resolveEventName [="load"] The event name to bind resolve to.
- * @param {string} rejectEventName [="error"] The event name to bind reject to.
- */
-function bindEvents(element, resolveEventName, rejectEventName) {
-  element.eventPromise =
-      bindEvents2(element, resolveEventName, element, rejectEventName);
-}
-
-// Returns a promise wrapping success and error events of objects.
-// This is a variant of bindEvents that can accept separate objects for each
-// events and two events to reject, and doesn't set `eventPromise`.
-//
-// When `resolveObject`'s `resolveEventName` event (default: "load") is
-// fired, the promise is resolved with the event.
-//
-// When `rejectObject`'s `rejectEventName` event (default: "error") or
-// `rejectObject2`'s `rejectEventName2` event (default: "error") is
-// fired, the promise is rejected.
-//
-// `rejectObject2` is optional.
-function bindEvents2(resolveObject, resolveEventName, rejectObject, rejectEventName, rejectObject2, rejectEventName2) {
-  return new Promise(function(resolve, reject) {
-    const actualResolveEventName = resolveEventName || "load";
-    const actualRejectEventName = rejectEventName || "error";
-    const actualRejectEventName2 = rejectEventName2 || "error";
-
-    const resolveHandler = function(event) {
-      cleanup();
-      resolve(event);
-    };
-
-    const rejectHandler = function(event) {
-      // Chromium starts propagating errors from worker.onerror to
-      // window.onerror. This handles the uncaught exceptions in tests.
-      event.preventDefault();
-      cleanup();
-      reject(event);
-    };
-
-    const cleanup = function() {
-      resolveObject.removeEventListener(actualResolveEventName, resolveHandler);
-      rejectObject.removeEventListener(actualRejectEventName, rejectHandler);
-      if (rejectObject2) {
-        rejectObject2.removeEventListener(actualRejectEventName2, rejectHandler);
-      }
-    };
-
-    resolveObject.addEventListener(actualResolveEventName, resolveHandler);
-    rejectObject.addEventListener(actualRejectEventName, rejectHandler);
-    if (rejectObject2) {
-      rejectObject2.addEventListener(actualRejectEventName2, rejectHandler);
-    }
-  });
-}
-
-/**
- * Creates a new DOM element.
- * @param {string} tagName The type of the DOM element.
- * @param {object} attrs A JSON with attributes to apply to the element.
- * @param {DOMElement} parent Optional - an existing DOM element to append to
- *     If not provided, the returned element will remain orphaned.
- * @param {boolean} doBindEvents Optional - Whether to bind to load and error
- *     events and provide the promise wrapping the events via the element's
- *     {@code eventPromise} property. Default value evaluates to false.
- * @return {DOMElement} The newly created DOM element.
- */
-function createElement(tagName, attrs, parentNode, doBindEvents) {
-  var element = document.createElement(tagName);
-
-  if (doBindEvents)
-    bindEvents(element);
-
-  // We set the attributes after binding to events to catch any
-  // event-triggering attribute changes. E.g. form submission.
-  //
-  // But be careful with images: unlike other elements they will start the load
-  // as soon as the attr is set, even if not in the document yet, and sometimes
-  // complete it synchronously, so the append doesn't have the effect we want.
-  // So for images, we want to set the attrs after appending, whereas for other
-  // elements we want to do it before appending.
-  var isImg = (tagName == "img");
-  if (!isImg)
-    setAttributes(element, attrs);
-
-  if (parentNode)
-    parentNode.appendChild(element);
-
-  if (isImg)
-    setAttributes(element, attrs);
-
-  return element;
-}
-
-function createRequestViaElement(tagName, attrs, parentNode) {
-  return createElement(tagName, attrs, parentNode, true).eventPromise;
-}
-
-/**
- * Creates a new empty iframe and appends it to {@code document.body} .
- * @param {string} name The name and ID of the new iframe.
- * @param {boolean} doBindEvents Whether to bind load and error events.
- * @return {DOMElement} The newly created iframe.
- */
-function createHelperIframe(name, doBindEvents) {
-  return createElement("iframe",
-                       {"name": name, "id": name},
-                       document.body,
-                       doBindEvents);
-}
-
-/**
- * requestVia*() functions return promises that are resolved on successful
- * requests with objects of the same "type", i.e. objects that contains
- * the same sets of keys that are fixed within one category of tests (e.g.
- * within wpt/referrer-policy tests).
- * wrapResult() (that should be defined outside this file) is used to convert
- * the response bodies of subresources into the expected result objects in some
- * cases, and in other cases the result objects are constructed more directly.
- * TODO(https://crbug.com/906850): Clean up the semantics around this, e.g.
- * use (or not use) wrapResult() consistently, unify the arguments, etc.
- */
-
-/**
- * Creates a new iframe, binds load and error events, sets the src attribute and
- *     appends it to {@code document.body} .
- * @param {string} url The src for the iframe.
- * @return {Promise} The promise for success/error events.
- */
-function requestViaIframe(url, additionalAttributes) {
-  const iframe = createElement(
-      "iframe",
-      Object.assign({"src": url}, additionalAttributes),
-      document.body,
-      false);
-  return bindEvents2(window, "message", iframe, "error", window, "error")
-      .then(event => {
-          assert_equals(event.source, iframe.contentWindow);
-          return event.data;
-        });
-}
-
-/**
- * Creates a new image, binds load and error events, sets the src attribute and
- *     appends it to {@code document.body} .
- * @param {string} url The src for the image.
- * @return {Promise} The promise for success/error events.
- */
-function requestViaImage(url) {
-  return createRequestViaElement("img", {"src": url}, document.body);
-}
-
-// Helpers for requestViaImageForReferrerPolicy().
-function loadImageInWindow(src, attributes, w) {
-  return new Promise((resolve, reject) => {
-    var image = new w.Image();
-    image.crossOrigin = "Anonymous";
-    image.onload = function() {
-      resolve(image);
-    };
-
-    // Extend element with attributes. (E.g. "referrerPolicy" or "rel")
-    if (attributes) {
-      for (var attr in attributes) {
-        image[attr] = attributes[attr];
-      }
-    }
-
-    image.src = src;
-    w.document.body.appendChild(image)
-  });
-}
-
-function extractImageData(img) {
-    var canvas = document.createElement("canvas");
-    var context = canvas.getContext('2d');
-    context.drawImage(img, 0, 0);
-    var imgData = context.getImageData(0, 0, img.clientWidth, img.clientHeight);
-    return imgData.data;
-}
-
-function decodeImageData(rgba) {
-  var rgb = new Uint8ClampedArray(rgba.length);
-
-  // RGBA -> RGB.
-  var rgb_length = 0;
-  for (var i = 0; i < rgba.length; ++i) {
-    // Skip alpha component.
-    if (i % 4 == 3)
-      continue;
-
-    // Zero is the string terminator.
-    if (rgba[i] == 0)
-      break;
-
-    rgb[rgb_length++] = rgba[i];
-  }
-
-  // Remove trailing nulls from data.
-  rgb = rgb.subarray(0, rgb_length);
-  var string_data = (new TextDecoder("ascii")).decode(rgb);
-
-  return JSON.parse(string_data);
-}
-
-// A variant of requestViaImage for referrer policy tests.
-// This tests many patterns of <iframe>s to test referrer policy inheritance.
-// TODO(https://crbug.com/906850): Merge this into requestViaImage().
-// <iframe>-related code should be moved outside requestViaImage*().
-function requestViaImageForReferrerPolicy(url, attributes, referrerPolicy) {
-  // For images, we'll test:
-  // - images in a `srcdoc` frame to ensure that it uses the referrer
-  //   policy of its parent,
-  // - images in a top-level document,
-  // - and images in a `srcdoc` frame with its own referrer policy to
-  //   override its parent.
-
-  var iframeWithoutOwnPolicy = document.createElement('iframe');
-  var noSrcDocPolicy = new Promise((resolve, reject) => {
-        iframeWithoutOwnPolicy.srcdoc = "Hello, world.";
-        iframeWithoutOwnPolicy.onload = resolve;
-        document.body.appendChild(iframeWithoutOwnPolicy);
-      })
-    .then(() => {
-        var nextUrl = url + "&cache_destroyer2=" + (new Date()).getTime();
-        return loadImageInWindow(nextUrl, attributes,
-                                 iframeWithoutOwnPolicy.contentWindow);
-      })
-    .then(function (img) {
-        return decodeImageData(extractImageData(img));
-      });
-
-  // Give a srcdoc iframe a referrer policy different from the top-level page's policy.
-  var iframePolicy = (referrerPolicy === "no-referrer") ? "unsafe-url" : "no-referrer";
-  var iframeWithOwnPolicy = document.createElement('iframe');
-  var srcDocPolicy = new Promise((resolve, reject) => {
-        iframeWithOwnPolicy.srcdoc = "<meta name='referrer' content='" + iframePolicy + "'>Hello world.";
-        iframeWithOwnPolicy.onload = resolve;
-        document.body.appendChild(iframeWithOwnPolicy);
-      })
-    .then(() => {
-        var nextUrl = url + "&cache_destroyer3=" + (new Date()).getTime();
-        return loadImageInWindow(nextUrl, null,
-                                 iframeWithOwnPolicy.contentWindow);
-      })
-    .then(function (img) {
-        return decodeImageData(extractImageData(img));
-      });
-
-  var pagePolicy = loadImageInWindow(url, attributes, window)
-    .then(function (img) {
-        return decodeImageData(extractImageData(img));
-      });
-
-  return Promise.all([noSrcDocPolicy, srcDocPolicy, pagePolicy]).then(values => {
-    assert_equals(values[0].headers.referer, values[2].headers.referer, "Referrer inside 'srcdoc' without its own policy should be the same as embedder's referrer.");
-    assert_equals((iframePolicy === "no-referrer" ? undefined : document.location.href), values[1].headers.referer, "Referrer inside 'srcdoc' should use the iframe's policy if it has one");
-    return wrapResult(values[2]);
-  });
-}
-
-/**
- * Initiates a new XHR GET request to provided URL.
- * @param {string} url The endpoint URL for the XHR.
- * @return {Promise} The promise for success/error events.
- */
-function requestViaXhr(url) {
-  return xhrRequest(url).then(result => wrapResult(result));
-}
-
-/**
- * Initiates a new GET request to provided URL via the Fetch API.
- * @param {string} url The endpoint URL for the Fetch.
- * @return {Promise} The promise for success/error events.
- */
-function requestViaFetch(url) {
-  return fetch(url)
-    .then(res => res.json())
-    .then(j => wrapResult(j));
-}
-
-function dedicatedWorkerUrlThatFetches(url) {
-  return `data:text/javascript,
-    fetch('${url}')
-      .then(() => postMessage(''),
-            () => postMessage(''));`;
-}
-
-function workerUrlThatImports(url) {
-  return `data:text/javascript,import '${url}';`;
-}
-
-/**
- * Creates a new Worker, binds message and error events wrapping them into.
- *     {@code worker.eventPromise} and posts an empty string message to start
- *     the worker.
- * @param {string} url The endpoint URL for the worker script.
- * @param {object} options The options for Worker constructor.
- * @return {Promise} The promise for success/error events.
- */
-function requestViaDedicatedWorker(url, options) {
-  var worker;
-  try {
-    worker = new Worker(url, options);
-  } catch (e) {
-    return Promise.reject(e);
-  }
-  worker.postMessage('');
-  return bindEvents2(worker, "message", worker, "error")
-    .then(event => wrapResult(event.data));
-}
-
-function requestViaSharedWorker(url) {
-  var worker;
-  try {
-    worker = new SharedWorker(url);
-  } catch(e) {
-    return Promise.reject(e);
-  }
-  const promise = bindEvents2(worker.port, "message", worker, "error")
-    .then(event => wrapResult(event.data));
-  worker.port.start();
-  return promise;
-}
-
-// Returns a reference to a worklet object corresponding to a given type.
-function get_worklet(type) {
-  if (type == 'animation')
-    return CSS.animationWorklet;
-  if (type == 'layout')
-    return CSS.layoutWorklet;
-  if (type == 'paint')
-    return CSS.paintWorklet;
-  if (type == 'audio')
-    return new OfflineAudioContext(2,44100*40,44100).audioWorklet;
-
-  assert_unreached('unknown worklet type is passed.');
-  return undefined;
-}
-
-function requestViaWorklet(type, url) {
-  try {
-    return get_worklet(type).addModule(url);
-  } catch (e) {
-    return Promise.reject(e);
-  }
-}
-
-/**
- * Sets the href attribute on a navigable DOM element and performs a navigation
- *     by clicking it. To avoid navigating away from the current execution
- *     context, a target attribute is set to point to a new helper iframe.
- * @param {DOMElement} navigableElement The navigable DOMElement
- * @param {string} url The href for the navigable element.
- * @return {Promise} The promise for success/error events.
- */
-function requestViaNavigable(navigableElement, url) {
-  var iframe = createHelperIframe(guid(), false);
-  setAttributes(navigableElement,
-                {"href": url,
-                 "target": iframe.name});
-
-  const promise =
-    bindEvents2(window, "message", iframe, "error", window, "error")
-      .then(event => {
-          assert_equals(event.source, iframe.contentWindow, "event.source");
-          return event.data;
-        });
-  navigableElement.click();
-  return promise;
-}
-
-/**
- * Creates a new anchor element, appends it to {@code document.body} and
- *     performs the navigation.
- * @param {string} url The URL to navigate to.
- * @return {Promise} The promise for success/error events.
- */
-function requestViaAnchor(url, additionalAttributes) {
-  var a = createElement(
-      "a",
-      Object.assign({"innerHTML": "Link to resource"}, additionalAttributes),
-      document.body);
-
-  return requestViaNavigable(a, url);
-}
-
-/**
- * Creates a new area element, appends it to {@code document.body} and performs
- *     the navigation.
- * @param {string} url The URL to navigate to.
- * @return {Promise} The promise for success/error events.
- */
-function requestViaArea(url, additionalAttributes) {
-  var area = createElement(
-      "area",
-      Object.assign({}, additionalAttributes),
-      document.body);
-
-  // TODO(kristijanburnik): Append to map and add image.
-  return requestViaNavigable(area, url);
-}
-
-/**
- * Creates a new script element, sets the src to url, and appends it to
- *     {@code document.body}.
- * @param {string} url The src URL.
- * @return {Promise} The promise for success/error events.
- */
-function requestViaScript(url, additionalAttributes) {
-  const script = createElement(
-      "script",
-      Object.assign({"src": url}, additionalAttributes),
-      document.body,
-      false);
-
-  return bindEvents2(window, "message", script, "error", window, "error")
-    .then(event => wrapResult(event.data));
-}
-
-/**
- * Creates a new form element, sets attributes, appends it to
- *     {@code document.body} and submits the form.
- * @param {string} url The URL to submit to.
- * @return {Promise} The promise for success/error events.
- */
-function requestViaForm(url) {
-  var iframe = createHelperIframe(guid());
-  var form = createElement("form",
-                           {"action": url,
-                            "method": "POST",
-                            "target": iframe.name},
-                           document.body);
-  bindEvents(iframe);
-  form.submit();
-
-  return iframe.eventPromise;
-}
-
-/**
- * Creates a new link element for a stylesheet, binds load and error events,
- *     sets the href to url and appends it to {@code document.head}.
- * @param {string} url The URL for a stylesheet.
- * @return {Promise} The promise for success/error events.
- */
-function requestViaLinkStylesheet(url) {
-  return createRequestViaElement("link",
-                                 {"rel": "stylesheet", "href": url},
-                                 document.head);
-}
-
-/**
- * Creates a new link element for a prefetch, binds load and error events, sets
- *     the href to url and appends it to {@code document.head}.
- * @param {string} url The URL of a resource to prefetch.
- * @return {Promise} The promise for success/error events.
- */
-function requestViaLinkPrefetch(url) {
-  var link = document.createElement('link');
-  if (link.relList && link.relList.supports && link.relList.supports("prefetch")) {
-    return createRequestViaElement("link",
-                                   {"rel": "prefetch", "href": url},
-                                   document.head);
-  } else {
-    return Promise.reject("This browser does not support 'prefetch'.");
-  }
-}
-
-/**
- * Initiates a new beacon request.
- * @param {string} url The URL of a resource to prefetch.
- * @return {Promise} The promise for success/error events.
- */
-async function requestViaSendBeacon(url) {
-  function wait(ms) {
-    return new Promise(resolve => step_timeout(resolve, ms));
-  }
-  if (!navigator.sendBeacon(url)) {
-    // If mixed-content check fails, it should return false.
-    throw new Error('sendBeacon() fails.');
-  }
-  // We don't have a means to see the result of sendBeacon() request
-  // for sure. Let's wait for a while and let the generic test function
-  // ask the server for the result.
-  await wait(500);
-  return 'allowed';
-}
-
-/**
- * Creates a new media element with a child source element, binds loadeddata and
- *     error events, sets attributes and appends to document.body.
- * @param {string} type The type of the media element (audio/video/picture).
- * @param {object} media_attrs The attributes for the media element.
- * @param {object} source_attrs The attributes for the child source element.
- * @return {DOMElement} The newly created media element.
- */
-function createMediaElement(type, media_attrs, source_attrs) {
-  var mediaElement = createElement(type, {});
-
-  var sourceElement = createElement("source", {});
-
-  mediaElement.eventPromise = new Promise(function(resolve, reject) {
-    mediaElement.addEventListener("loadeddata", function (e) {
-      resolve(e);
-    });
-
-    // Safari doesn't fire an `error` event when blocking mixed content.
-    mediaElement.addEventListener("stalled", function(e) {
-      reject(e);
-    });
-
-    sourceElement.addEventListener("error", function(e) {
-      reject(e);
-    });
-  });
-
-  setAttributes(mediaElement, media_attrs);
-  setAttributes(sourceElement, source_attrs);
-
-  mediaElement.appendChild(sourceElement);
-  document.body.appendChild(mediaElement);
-
-  return mediaElement;
-}
-
-/**
- * Creates a new video element, binds loadeddata and error events, sets
- *     attributes and source URL and appends to {@code document.body}.
- * @param {string} url The URL of the video.
- * @return {Promise} The promise for success/error events.
- */
-function requestViaVideo(url) {
-  return createMediaElement("video",
-                            {},
-                            {"src": url}).eventPromise;
-}
-
-/**
- * Creates a new audio element, binds loadeddata and error events, sets
- *     attributes and source URL and appends to {@code document.body}.
- * @param {string} url The URL of the audio.
- * @return {Promise} The promise for success/error events.
- */
-function requestViaAudio(url) {
-  return createMediaElement("audio",
-                            {},
-                            {"type": "audio/wav", "src": url}).eventPromise;
-}
-
-/**
- * Creates a new picture element, binds loadeddata and error events, sets
- *     attributes and source URL and appends to {@code document.body}. Also
- *     creates new image element appending it to the picture
- * @param {string} url The URL of the image for the source and image elements.
- * @return {Promise} The promise for success/error events.
- */
-function requestViaPicture(url) {
-  var picture = createMediaElement("picture", {}, {"srcset": url,
-                                                "type": "image/png"});
-  return createRequestViaElement("img", {"src": url}, picture);
-}
-
-/**
- * Creates a new object element, binds load and error events, sets the data to
- *     url, and appends it to {@code document.body}.
- * @param {string} url The data URL.
- * @return {Promise} The promise for success/error events.
- */
-function requestViaObject(url) {
-  return createRequestViaElement("object", {"data": url, "type": "text/html"}, document.body);
-}
-
-/**
- * Creates a new WebSocket pointing to {@code url} and sends a message string
- * "echo". The {@code message} and {@code error} events are triggering the
- * returned promise resolve/reject events.
- * @param {string} url The URL for WebSocket to connect to.
- * @return {Promise} The promise for success/error events.
- */
-function requestViaWebSocket(url) {
-  return new Promise(function(resolve, reject) {
-    var websocket = new WebSocket(url);
-
-    websocket.addEventListener("message", function(e) {
-      resolve(e.data);
-    });
-
-    websocket.addEventListener("open", function(e) {
-      websocket.send("echo");
-    });
-
-    websocket.addEventListener("error", function(e) {
-      reject(e)
-    });
-  })
-  .then(data => {
-      return JSON.parse(data);
-    });
-}
-
-// SanityChecker does nothing in release mode. See sanity-checker.js for debug
-// mode.
-function SanityChecker() {}
-SanityChecker.prototype.checkScenario = function() {};
-SanityChecker.prototype.setFailTimeout = function(test, timeout) {};
-SanityChecker.prototype.checkSubresourceResult = function() {};
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/iframe-inheritance.html b/tests/wpt/web-platform-tests/referrer-policy/generic/iframe-inheritance.html
index 6c54c43a815..3bab0979dd9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/iframe-inheritance.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/iframe-inheritance.html
@@ -7,7 +7,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
     <meta name="referrer" content="origin">
   </head>
@@ -25,7 +25,7 @@
         iframe.src = "about:blank";
         document.body.appendChild(iframe);
         iframe.contentDocument.write(`
-            <script src = "/referrer-policy/generic/common.js"></` + `script>
+            <script src = "/common/security-features/resources/common.js"></` + `script>
             <script src = "/referrer-policy/generic/referrer-policy-test-case.js"></` + `script>
             <script>
               var urlPath = "/referrer-policy/generic/subresource/xhr.py";
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/link-rel-prefetch.html b/tests/wpt/web-platform-tests/referrer-policy/generic/link-rel-prefetch.html
index 16452b1d690..0f78596fa2d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/link-rel-prefetch.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/link-rel-prefetch.html
@@ -5,7 +5,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <meta name="referrer" content="origin">
     <link rel="prefetch" href="/referrer-policy/generic/subresource/image.py">
   </head>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-and-values.html b/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-and-values.html
index ccbc02bec1b..d6b9408c153 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-and-values.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-and-values.html
@@ -5,7 +5,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
 
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-combined.html b/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-combined.html
index 7def76b9dd1..0b36aeee94c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-combined.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-combined.html
@@ -5,7 +5,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
 
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-one-invalid.html b/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-one-invalid.html
index eb6c21731b3..599ffdccc3e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-one-invalid.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-one-invalid.html
@@ -5,7 +5,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
 
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-one-unknown-token.html b/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-one-unknown-token.html
index 91e216b22a1..cf9a7921626 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-one-unknown-token.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-one-unknown-token.html
@@ -5,7 +5,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
 
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers.html b/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers.html
index a74cf60d89a..418044a14cd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers.html
@@ -5,7 +5,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
 
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html b/tests/wpt/web-platform-tests/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html
index 73b48f1d5c0..103627b21df 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html
@@ -7,7 +7,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
   </head>
   <body>
@@ -26,7 +26,7 @@
           iframe.sandbox = sandboxAttributes;
           iframe.srcdoc = `
               <meta name = "referrer" content = "always">
-              <script src = "/referrer-policy/generic/common.js"></` + `script>
+              <script src = "/common/security-features/resources/common.js"></` + `script>
               <script src = "/referrer-policy/generic/referrer-policy-test-case.js"></` + `script>
               <script>
                 var urlPath = "/referrer-policy/generic/subresource/xhr.py";
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/area-navigate.html b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/area-navigate.html
index c601c249d0f..b7f05be9892 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/area-navigate.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/area-navigate.html
@@ -6,7 +6,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/fetch-messaging.html b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/fetch-messaging.html
index 4d40245123f..2c12ae45510 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/fetch-messaging.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/fetch-messaging.html
@@ -6,7 +6,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/iframe-messaging.html b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/iframe-messaging.html
index 3072436bc64..3bfada318f2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/iframe-messaging.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/iframe-messaging.html
@@ -6,7 +6,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/image-decoding.html b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/image-decoding.html
index b132c06c3f1..807344dab9f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/image-decoding.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/image-decoding.html
@@ -6,7 +6,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/link-navigate.html b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/link-navigate.html
index 583458b5359..8c5d2c83866 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/link-navigate.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/link-navigate.html
@@ -6,7 +6,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/script-messaging.html b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/script-messaging.html
index 7bc36dc7abf..cdeb1a03ed3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/script-messaging.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/script-messaging.html
@@ -6,7 +6,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/worker-messaging.html b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/worker-messaging.html
index 9daf6d5f902..7ef9b381ae4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/worker-messaging.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/worker-messaging.html
@@ -6,7 +6,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/xhr-messaging.html b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/xhr-messaging.html
index a0208051206..1bd1b4c724e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/xhr-messaging.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/xhr-messaging.html
@@ -6,7 +6,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/template/test.debug.html.template b/tests/wpt/web-platform-tests/referrer-policy/generic/template/test.debug.html.template
index 0faf63bddb3..ce7761b949d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/template/test.debug.html.template
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/template/test.debug.html.template
@@ -8,7 +8,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <!-- The original specification JSON for validating the scenario. -->
     <script src="/referrer-policy/spec_json.js"></script>
     <!-- Internal checking of the tests -->
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/template/test.release.html.template b/tests/wpt/web-platform-tests/referrer-policy/generic/template/test.release.html.template
index 0d63fd68aef..e55a50bdc41 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/template/test.release.html.template
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/template/test.release.html.template
@@ -9,8 +9,7 @@
     <meta name="assert" content="%(test_description)s">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/unsupported-csp-referrer-directive.html b/tests/wpt/web-platform-tests/referrer-policy/generic/unsupported-csp-referrer-directive.html
index 40942a8a035..f639ead4d43 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/unsupported-csp-referrer-directive.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/unsupported-csp-referrer-directive.html
@@ -6,7 +6,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index 101f2089210..cbe5c3409c1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index e5e6a7861d6..bdbf8c10128 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index 9d0ab240072..7bdbbc130db 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index a8935c2be47..7badfd8b68f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index 35d6245f51a..456672827fb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index dae1ad56c19..f3a056045a9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index 86fa9997cac..3498954b562 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index f8712fd2a42..d474e014b14 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index 701ec1dba42..d4835b418fd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index d1b0482e16f..df7e879bed2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 9dcfbac38af..4fa4a9e8389 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index 9f8f2d884db..72be051717d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index ca6ada18114..1ad65c0bf41 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index 49a8973c42e..81f4844a678 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index a1eaf56efbf..1c7bce4c0dd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 70e193434bb..370d6387193 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 85d4a15f7af..81553daeb19 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index e6863a13df8..9c5d60894ea 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index 9a2dd530ff9..301c53de000 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index 058e087238a..a17c9867c1c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index 20d2c1be3d7..7035e54e003 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index c5c0dd24157..4208fb4944f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index d5e3b9fe04d..79180dd3408 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index b3e883240b7..cfcaf54f025 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index 1415f88e61b..a31e8ef5d94 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index c9e14a5c67a..59edb33d0c6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index 1197e4ea08a..c9959ff21aa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index c2c4ccdb714..2d0c22356dd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index e5da88157d5..91c0a42f51a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index a0e3be12513..dc29dbf6b80 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index ca23aa444bd..11bfaaa5011 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index 34a7176c909..cde4ea0089d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 621a3f4f5de..a28f30625e8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index 7081357984a..65bd20884db 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index ca8b0837bbb..1e92417cd9c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 553af1be531..1ea239cd839 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 5ac87bc663a..f0826241b16 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index 389921d4d8f..feec9a66a67 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index dfbabf21082..dac22586386 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index 233611e6952..1710dd861f8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index 13393673941..43faed2e589 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
index 301edeccd84..53d3ed97e59 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
index e398d4662d6..9386254ef46 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
index eb995697d5c..97f3d84dfcc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index a05ee8ec350..9f12fd80e53 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index 00e0b12f96b..7389528742f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index 4e1745300b2..3e87aa52cd9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index 99be5759bc8..8d779a2ac85 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index 8b4c4a85cff..f8f58a8ed4d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index 3a808fa1663..61e507067e8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index e6a4a48ef50..ed912fdbcc6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index 5b6a0f069f0..bb4ccc4abf2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index 45a76a77635..ddc4a43ffd7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
index a3f6a8b6092..0adea708a1d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
index 013ad95a13a..2756f376450 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
index eb834de9b0e..a92a57a999b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index babd2f18cc5..5effff6c0e0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index a3f6d25c82f..a386a250de0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index 7e456c4025a..041a0deff1d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index 6684bb31ed0..3eed81bb188 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index 29375681681..91e8184af98 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 695a773b087..4dca8709603 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index f7e7f0bf280..451de2c941b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index a54cf864995..7f40332eebd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index b7adfc59b0e..427d70cb5c6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 6639c028e2e..d6783b55889 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index f6e4ba09b58..32996159605 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index 8aaee1ba91b..46da8711749 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index 0a7d63121c2..b7cd5889479 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index 5c4afd6b405..63841b8db44 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index bd9dec511f4..6b9d4d1c991 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index dd03fe58176..d030178341f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index ca38b699f4d..2aa0c8e1e43 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
index 5b0157e85f2..720329eab8e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
index 47a08ddf845..116f07c80db 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
index be990f2112a..4bc58094681 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index 8cf74125ad8..df2d8fc463e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index 7cb08817b90..dafaeb26443 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index 2a4bde0b9b6..b2aa15f1be1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index 55ccac1f143..8082bae869f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index 36e1fed42e4..dd54f1d1b90 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index fc4a9865cad..e6ab88cc7dc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
index 6cc76f7583b..30324735688 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
index 7eb7b813825..e8c152f1e54 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index c0fe57edd26..35f607209b4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index dffd45534d1..fc629c39dab 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index 79d8995f9c3..7148d4973c4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
index ab381f0c907..0fefd8d9e76 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
index d0b3f5affb1..1929fde3fa8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
index b900876cb4a..acf66a905b2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
index 834afccf676..75e2cd73efa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
index d521c167171..f9fb398c878 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
index 6299e8ec7f6..559872f1f31 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
index c67433bb724..ac2bec35ae2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index eec9e271431..34d782c22c7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index 8b46cf58362..f6f19227db0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index 94290a0c456..149727967dd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index dd800d38e48..eef23b2791d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index 96b2d3201b4..45f515c04cb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 75f0f333483..6970b1f74cf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index 97c4bb92e94..b529c14ef8a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index f6e9650e241..54d02b588ca 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 71ff29503cb..43c1f774cc4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 399bb0c14ac..8afc89e1119 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index 2ec45b40a56..c8046a61bd9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index 6a93f8429db..f5a16738869 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index 9b72d4bbb75..f4bec4504c0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index a7fac617780..68f694ea714 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index 6e8a612c8c4..4bd40993f26 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index 68cc5630158..7dbb5581889 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index af2ce4df2e8..2476110d8ef 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
index 33d9214bbe3..afb6b13cb43 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
index fe4596ea078..4c6f5692736 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
index 0f6a74f590f..ba9f9a0efef 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index 59fec560322..6517df33531 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index c3bc39e7afc..4e15e43099d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index d6efd897322..7638b0adf61 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index aa00c6f71d7..6eb29336a51 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index 55083571c65..1a8e73ce41b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index e1d4a6b3f2f..12b0d017dae 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index 6717cc2aa04..3ae13145cdf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index fd9e5863833..219c254ad1b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index d7fd00050f6..7f3aa55d9d9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
index 21f16002490..e69ae0802d6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
index aac4a2a3f41..e199ae2cd97 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
index 7e1ce57dd77..2198438fa27 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 05b5362b4f5..41e2e81b3ce 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index 8d84056e7ed..b66d22e3da7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index e09f582d736..f5c003efc76 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index e4f4232ae86..8e91b249fa7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index d3b557d7961..af01d1e1cac 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index c748f8c251a..99cfb54efab 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index 7ff4aea0e1d..31d98347369 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index cad3acfe5af..528ebdd0ebc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 6975f78071b..9a773233f62 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index b55f5379b46..691f8033a86 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index 514baf51fc4..86386e1910d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index 41ad2badffa..2d1cf98d233 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index 36c8aaeafc9..dbf7e114881 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index 6cee2216b9f..078f1e84f48 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index 5a67b55e663..d304fee7032 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index a3d17dd1d0b..d03e37d4e95 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index 5a33e4c4b50..b07d53206cd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
index c86db50d203..1593e0cb358 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
index ba698b85d32..33baa60317c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
index e153ebd848c..c31e2ae39c0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index e1d04f843c4..9222a8c716e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index 4451804cd8c..d8168c9bd1c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index ec8dcc3bb9f..eba59dffadb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index 13d58dccf56..d1331eb6d7f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index e7ed38632b1..6c9dcdfedc3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index ce744e0093b..09d4ca95c43 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
index 574cdccc9b6..54342e1433f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
index f452387ad23..69775f37f67 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index a70858c0585..0ad290b7eda 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index 621b1455019..139ed4d4fc7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index 134267bb13c..dcd8b45bbbb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
index f7b4c6c37e6..5e5ec8c220a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
index dce5baf64e0..7fc74dda97e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
index ff6b14d5a84..2d18c27a667 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
index d2541d3407f..bca073ce3ff 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
index 74f1935efac..abb708940f3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
index 2da8ff784ba..69954472242 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
index 559862ade99..4ff4f97ca7b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 844daf18c88..4c74d8957b6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index 293d8c3304b..8d26b422dd8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index 7571a86f52e..9337d1e45d5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index 96939619cda..27928aa098f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index c79814f0ec8..07ddfbc1555 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 04b4a59463f..d60eac9d39b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index 5c749f4bf97..dfc8c35b49f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index 5246fb54f55..cf4586caf02 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 3885e8a6a5a..0ab6410623e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 9de62cd2afb..53153eb74da 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index af9798b9c0f..a176cffd623 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index 36464436dea..1d6d93b81b7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index 455693efa7e..eaad1a0a98e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index 25ca0138fa4..f1bb3cc7079 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index dd5055d0e35..7aee747463a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index dbecd94064e..34e69f7c743 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
index c58c2c723ad..42461c7c829 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index 0b7655ace11..8e2c95011ff 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
index fe44085e3ee..76b93cb60d5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index 875a8ffe49e..def23fdf12f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index 58af86ef04a..a3266512ba4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
index fb82ab874ee..1c950d203e8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index bdabcd3f3bc..610a20c1269 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index 542395d1f30..f625618a1ae 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
index 178f813a614..678c75ab7d4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index ff9462ecbcd..000ce7b3969 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
index a0b8c34f540..ef883cab54d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index c5434c6cd00..24510a06613 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
index 0531f45d362..64efe12111b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index 8691721fefc..0f0dbd68163 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index 4d69c86dd15..275e6cfc16f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
index 3330e7cb732..343fecc8a78 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index f159ef61ee9..f648b8cf33e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index 890ab5be5d4..e99813ab543 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
index 1dd2d1c1c2f..1f77326ca74 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index 4c9e15551eb..91aa649a822 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
index 0a9f0a3af74..a9d51a2f5ad 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index 563ad1b91b8..c56bd5bc449 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
index 1271218d08b..e7d6a220827 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index a7b4ad7a5b9..91c171fa6d1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index 4ba159c7fb5..5ff941231bb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
index c52392c3248..5b394487e18 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index 51c5c524772..59f2fff31ef 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index 6edeebf3d75..68cd8261eba 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
index 0276285cd04..93adb6103c8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index 2760fdc1dde..de49d97286f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
index 2e65b4d125e..3c2855c9faa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index 639c0246bb8..0c7d14b0db3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
index 88db01292a3..64920f62819 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index 2663e303da5..2e10439957c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index 11f22d85858..55dc97173e8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
index 3ce8fa97772..d08bc429041 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index c17e9a8461c..5c49deb29f5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index d3a2a472881..eac501edc09 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
index 393a92a4ac0..1db72da39cf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index 2f2926b128c..31aca378f6d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html
index 34815f46112..99902760f7c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
index 57cddb7c4a9..8f7caf14940 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
index e0388dbf5e2..0ef53d8e08a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
index a3355ef9732..a81bfc96159 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index 1aed56a52c8..db728004ffe 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
index 4dc27f057f4..62a8de9b121 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index fc98c1d720a..a4efdd16e1c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index 435a4b7cb4f..106e6eda1b4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html
index 787e03d5b2e..d1093145df9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index 8dc6c82e1c1..d8d6b6eabf8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index 4a52130cced..60d19d4305f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html
index 0b5fc217858..9b31ed7bef6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index 5a47798f03e..7990117a904 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
index 5fece1114a6..bb87b5bda2b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
index f3921aaf56d..b4ed0577d2c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
index 04ddbada0aa..36d5d03971a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html
index 1d3f7dce1f9..ee6a4b4ba23 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
index 68528a3d118..d40a7ac8581 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
index 0485112fb13..d65fd11b9c8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
index c2ae6abed99..8f80e815469 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index 43a2c9c6fb8..5bbfd0ef4a1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
index c6fafef5735..a0d023540f2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index d0b61af2ba9..0515d6436af 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index 07949589bd7..3d1bd73fb7a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html
index 325eaeba031..f13681a3526 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index b68a4e51795..e1ebe43e391 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index 8f8f01f20fd..bd6869a2baa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html
index 74cf6d4e792..3d9b9f132ce 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index 57c858aec84..1d35ee33a72 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
index 097b8cdd3f0..44011453965 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
index c53cf0d94ef..86a68a6727e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
index a9370a998dd..df3ab816891 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html
index 713221d297a..f1422ed24cd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
index 712a2cee4ee..cff3a8801ff 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html
index db4b684c794..da2c5b7e1f5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
index 334c549171b..5f3514b0b46 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index 9a38440128a..bc6d22ad507 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
index 5e8d81c2d04..1290c5100b6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index a49ecda4db7..c903683a81b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index 723f22630c8..d940f083894 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html
index c11e69041be..ddd50e267bc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index fd4612effbf..2ef7ddeffcc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
index b18fbef56a8..b9e3c4b3f0d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html
index 3edc386aaa2..9ec62aa2d1b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index 4f12853c0fc..303a8d01824 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html
index 52d3ae1264c..f7e1767c96a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index cb20e18af7c..635660b9017 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
index 636bf3735b1..b2f2be724c1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html
index 38473b34702..234103dd8f7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
index e0d3bd0faf8..c82c8a4e971 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html
index f6a5f615bb4..32a281aaf9a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
index 8a49347b7b1..c69b1e7d41b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html
index 9ab2958e4b7..9568f28ecdd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
index bda2e617536..65b43ac75cb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html
index 131a9c07803..76805bf942a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
index c114a3f8a85..e497c4ba0ae 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html
index f1dc1238a12..f2515906f58 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
index 44e0199f5b3..f7ca726736d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index b7b1fc54729..995443fbceb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
index 216a1e6cde3..2c6590ac4b3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index 355f562c1d9..5334977c62d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index e6154259563..db04564136b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html
index 7170884a6e3..d4672cd6dd4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index 65a9ba9b7bf..eb3a48481c3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index 20dda3fe160..3f28ff20799 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html
index 9beec5d648d..cebab2ca35c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index d02fce2bbee..05b25458fe0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
index ec472b264cd..7dff4f79bbd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html
index deb8d736bf4..bb4388c1017 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
index 8fa40cb4871..f2a7ddc3296 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
index 4f02037581d..93289f82c18 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
index bc1c5021a70..26d52678563 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
index 7b2c327c320..7e483a26903 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
index e5ea31157f4..c06245306dc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index cd54256ad03..fdbd90e2f82 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
index 84b7c650fbf..3825e542977 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index b9e130b9623..4d7d1e02d9a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index ee64a399167..5d5c4a021bf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
index 83168afa28a..e0ec15fca9c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index 6e624a4c006..f803cc2e72a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index 206283f3161..4365a3afe01 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
index c45116994e3..637ae9566e6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index c4399815df9..fa6e076d365 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
index 29831095ffa..1b27a92e3da 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
index 488a26b4330..8185f000271 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
index 1cf420f9338..5b2f107682e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
index 31e5d1662cc..a82dc84b109 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
index 15ff3f5ac47..c9fa90ef0b8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
index 0dd487b42c7..4765b57cd8d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
index b48e453103f..1bf43d9a4fa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index ba04f94ac07..d71c10f55ef 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
index b35d2db838a..765c59ffd9d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index e923921d150..375e1d4231c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index c1b54abd4bd..587d613bbdf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
index 3ce10371156..58b04f610da 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index 1b4719a32c6..046b05f8b45 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index b83af76c638..5f8628516a8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
index a370ed35885..fa09d764d3b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index fa2e7a8f5d0..f0ceb06c7cf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
index 485702bc234..f6f7a8a8477 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
index c412dce6cf1..8bd07880730 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
index c1c32ba312c..0216050b5aa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
index 1a73ec9e959..de157bfd629 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
index 852b2a7ac53..71975a01784 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html
index fa18f832d73..ccddbcf5056 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
index e8a9e514414..f035f115030 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index 7932dd8bb57..b05eb93ff6b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
index 324251c10f1..d5dc7e24c1a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index 67df3bc8fcf..feccd9a975d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index 9000bcbee23..f0e0db6e04a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
index 7f5cb7c8f9f..362bf8ff289 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index ea981ad14d0..43704298c33 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
index ea935b1d542..64317423276 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html
index e22b638b5d1..38d05a3f563 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index 222b078cc66..fd5ce02eca1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
index 3c1c41cda1a..86526c3f5ef 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index 954dede4acf..a9135e537c0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
index d2fc88f0bf9..2631486b1db 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html
index 6da08e2e0e1..74c932ed4a3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
index b9ac0adff0d..1cd5af2177d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html
index 1cb5b30bafb..500eae54273 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
index b0528816da0..bfce0b6d8c0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html
index 524e650e983..157ae0f93c0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
index 0b6580b2ee3..e2b004a8087 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
index 7932926619c..cffa02a3135 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
index 5c88dcae2c9..622f2bfe56e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html
index 2a83f8cc91a..44e6203fd17 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
index 3714b4a982f..ac1ec15f433 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index 57b4df568c2..69224666c66 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
index dcf26139b43..eb74c6f2b96 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index 070d4283a13..79098e561dc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index 9da6e448ba7..be002de7b25 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
index 2159b24e03f..77e3b3c1103 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index aa032ca43e3..151c44ad31b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index 6e0dcd4c2c1..368ad71f83c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
index 25559421d06..6b96346dcc7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index 04bb56842b7..349ad204609 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
index da806358dbe..be53cee6f8e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html
index 253f15de81c..f8da5cabac8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
index 3b5271935c2..c3a50470784 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
index 822706864ff..b3ab5455079 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
index 9455ed856d3..d4bf7a1f1de 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
index a6512954b88..d762dee151a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
index af8c262adf2..c9d1b4e49be 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
index 2b634b85e40..927ee8c2e2f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
index 42ed329bf25..a3df64017d9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
index 9e78e962ca6..ff3342e75ee 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
index d34b4ae25bb..74205b4add2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
index f8a200230bb..a303873f893 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
index 38a61d264a7..4c6c29ddfcd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
index 0626306d65a..99144cde544 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
index f0dd273c320..a33e68004bb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
index 0687cc22f52..accf8eb7510 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
index 7b6dd7b981a..58aa461d790 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
index c371ce99322..9924d010f77 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
index 5bfef0ff661..421dfc01dde 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
index 856951865ef..78f45838ed8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
index 098b987b99d..6bfcaa40580 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
index 2d8217031d1..66360f4eb4b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
index fce7ad9933b..19daec1b686 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
index eadb3d1d614..db98a1c7e9f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
index 1bcb41746d7..f64f19a7268 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
index 8f3c27f7e6d..390a5f5a8b2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
index 6633b43a0ef..cb9953893e2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
index 36941155b10..b9e48fe2187 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
index fc05b1e52c3..91441418f73 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
index 56560123ce3..fb3699920a1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
index 318ffd577a2..b5209c4858d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
index dea7ad286ee..e725c59f612 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
index 46c715d6aa2..50ae40ee38c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html
index 12903c4da40..cd50a0c7361 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html
index ca0b0b1b5f5..ce16bd7550d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html
index 19cf59322f7..50e426c1fee 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
index 77452623c86..ce5af8884f8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html
index f0c9e6fd969..f089bb5418f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html
index 2aed178fd08..080b7afc6bd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
index 4e184519eb8..7bcb5d59a58 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html
index 9063bbd5ee5..4bb082ea49f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html
index 56bc742d64d..4da9437134f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
index 3209c5beebf..c3733730a05 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
index d78b7146cce..9f902d25220 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
index f4902bd2726..a0aeaaaae51 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
index fac6166811f..ad6787e78f7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
index 7385003cf8a..4a00eabbced 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
index 5e3a82f01bd..aef8b034271 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
index 6eed1d7792d..174286a0f9c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
index cc3f2c42a09..3fc318a61f7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
index c9f973b9bfb..347ebc1f5ef 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
index 6850d329d04..9e3c50929b6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
index a27a2ee4e04..1437c09ff82 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
index 67a7335ef21..894f2190227 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
index bace4139853..4bac2f35920 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
index ebedf9e28d1..ca8069f30b5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
index 58121f98f3a..0f50430ef1c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
index 7381c138364..036b2a536eb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
index 5117e3dd82a..361e380f85e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
index 637ed02656e..b99ccab0779 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
index 20fe88fde19..0fb80285ebb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
index 224fc53a05e..302bd240579 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
index 856662a7799..e94605844b4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
index 17f78140023..e216544db00 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
index 53d9a704411..c9a82a7ec97 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
index 423c8ed2078..ec1aa5fe20c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
index 790b68586f7..21e76cbb71f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
index 1dae9fecc53..e70bb298ad2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
index 75644a3ccc1..221f559302e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
index 2a226c6e18a..4231bf5a5c4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
index e1c3ecd1286..c52248944d9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
index edd101a837e..f52c97603ad 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
index 37979395e12..3260bde8f75 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
index bc7c6d02d50..87ef4d3d75f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
index f9fbbbc3233..f3dbd367410 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
index f481aa975e9..aed37136cba 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
index 6ef928b6e19..c16e78db1fc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
index b253ef85283..86212da23f3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
index 2d20c7c6dd1..b90134b21ac 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
index 67169cf167c..4b0dcf7c293 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
index d21c6bda10d..8f70ddb5f58 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
index 3859dcedf3c..70e6d49f088 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
index 77f71fb3924..2b5ad603b3c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
index 024d43ea15a..05110163091 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
index fa35c1f3e97..791dcb00a42 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html
index 291f4928bad..5c9f234f570 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html
index f4006d10ac4..add6afd2523 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
index 61669344ddd..98e6da8e6bb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
index 4daa0771923..9d29a062d98 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
index 369e98e0f07..e00321d72c9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html
index bac83829eb5..f525e4b737b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html
index b6fe7805564..dc152b1c1c3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
index 1ae15983f6c..a775758ece4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
index 14159b0d5b9..92a2d44535a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
index 3ca50f3d66f..8f18dd1eca2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
index 5bddea2b1cd..5f68ddb6d6a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
index 9798ee5b045..0f397527f7f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html
index 79e75063576..272b00eca26 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html
index ee78d6ef1e9..d926e88b7cb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html
index 0019b7d1f33..35523543b1d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
index f4020bdff8a..cba63f68e23 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html
index 48dcc5d522e..f44abaac86d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html
index 6cc4669d988..7666ac3fdcc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
index b1bacfe9bba..098ff416ee5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html
index 08156b668c4..ac60e28d9f2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html
index ae1f44978c7..c7c01131967 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
index 7b0f9d4b3b7..cd1bae5c066 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html
index 633eb15d97a..fd4d713c8a7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html
index b7dd2d260b2..7d2da9aebe1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
index d968e31f462..60a11860cca 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html
index cde3c4dcb62..9b24a9b8227 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html
index 69e0ac3f392..351d30bd251 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
index f9f5cbfc2e0..c665e5b43f5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
index 6a1e8da86f0..05b86531109 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
index cae0548b281..97c82f66ef0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
index dfbdf4e3741..9537a48957f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
index 33a64908d8f..368b0ee1619 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
index 99d89c892d9..4211efaba0b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
index efc15af9bbc..d60f065db50 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
index 6457b6d07b6..662e24872c2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
index b4895ecb1ca..38948e13c4c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
index 8253f1e26e2..907cc36092e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
index 8319c47992e..c75f25713b1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
index c96142058fc..f39fb3987d1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
index fc660463785..7e687422087 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
index a821ec58add..17bd96e9ef9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
index f86d0e825ca..a9a7577a85d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
index f4826c63ac5..11a875323c7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
index d83650ee366..a0ed420f942 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
index d2784edeecf..f1bf5cd0800 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
index 48676a9744d..bbd7756d552 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
index 2812882a2ad..293db9a254e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
index cc13e377b14..33680a39508 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
index bbb011122af..9374b0c9976 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
index 6d3ec1b9633..2b6af670a40 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
index 76c95cdea76..af557c3e097 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
index 114d4dc8656..e5013b496c5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
index 0b7378bd620..f8f883c5a55 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
index d5e863d2ea5..071c2023856 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
index 94f0f0b675e..4f717db0327 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
index 4a1ba7ae95d..7fb3baf96cc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
index 7009e93f4b9..a5d2f72ea37 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
index 219ae6d8498..f3aa717b93a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
index df5a52f9a85..8e682a3f3d3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
index 7436b397896..fa83b85d074 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
index ef7b77d48eb..f3686ad81e8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
index ebaa47c7220..7e81614e044 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
index 6cb598b3818..331bbdc50e3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
index f7b66102892..dac39cccddd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
index cc2175edbb9..d18ea4abd82 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
index b8cecaeed14..09d5070910f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
index ba8b28780de..695925490df 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
index 9aa2e5128fc..0da5165131e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
index 9d997bd1ae9..0549934ffda 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
index 0245434f37c..da3532e1f2e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html
index 12b857b64dc..2a4336594a2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html
index 056ff4efbf2..2ef56b06f56 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
index 969d7e8dd4c..2daf158239d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
index 091ce5d0eb1..13d8b9b5c4a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
index 9be9f24e6ee..ac38dd8430b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html
index 8a7bdc29a40..31b0ed5f974 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html
index 4618f8eb3e5..68e7b3b7954 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
index 3bd6428d327..7ba521e0a07 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
index 497b8f61748..23de8a05042 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
index 225c18eb7a0..400db8eb15a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
index eb3e612fd3d..fd20ee80fc3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
index ef09fe30ce3..2df2a64f157 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html
index 2111a0cf7c5..410b0f60abf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html
index f0adebf34b3..e8a7f7a9a92 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html
index 4d5714f87f1..c453f6b2057 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
index 6578bd1e631..97964228c16 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html
index 94802477e7b..54fbe6c6b23 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html
index a4298049e50..bb4c5d584e8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
index 548e63ea974..fa5da93f320 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html
index 32da6f1eaae..1c793e5d20f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html
index c7367f70659..af71d2cb0af 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
index a0e33c7205f..7b048dfdd0c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html
index c80a3c7e52f..de54508cc61 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html
index e7e65e19ec6..2cb2c9cafa0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
index 42ecdbc0fd8..beef748465d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html
index c6dcc471c47..7ff81f1acad 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html
index 53505abe07c..bbacb9889fa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
index 76b1b2df5fa..75cafd9d013 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
index 290d81d821a..aa620be4072 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index 403b08e5dc7..a75718db06c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
index 25e9e2f45fb..685c62057be 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index 0ae83292f8a..7914e4c5793 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index 7358e1c7019..a24dbda650f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
index 77b87b8cb97..7ec3eda9fed 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index e8ba9a75940..214480ca0ea 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index 9be1730a90e..1a4d14979f2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
index a7d72f50618..d120b9c1554 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index 9bfb0810d3d..e634d528dcd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
index 6d528c04d01..41d7e859d41 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index 5622a50bf20..48189b1adab 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
index dfdf69fbcdc..8f7a234ad56 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index f5542f97e1c..8a7a4cd9f65 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index 8cec185e133..a8683941774 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
index 9cb253f3569..f4275d6d7a8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index 2ce74e688b9..248ffa35a82 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index 0a24543d610..16c44750747 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
index 463b67ec4ae..8bf0a00458e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index 10ef951d91e..611336e515f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
index 899f078c943..bdf2c0192a8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index ce0b1252eae..e5f01e66932 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
index 39304901c55..e471f0a9e75 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index 98710624904..8f7e7201ff8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index 33d76d384f2..c52859bbb7a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
index 56a0eabe7df..30075aff0b6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index 2befe6ff381..3f84d37ade1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index 84333fbb7ab..7a233bfc2fa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
index 15cd9b2b89a..3e523d9f3cd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index 10984fde1aa..532f0c5c33c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
index e71d09acc8f..f9c2b476b4f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index c9cb06842c5..7ff76ce0747 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
index c6f8e1490fb..dc86ae02073 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index dd44b6679a8..3ed7638a2fe 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index 2ae35e05039..ea62578df2b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
index 2b7cc6d5954..50d5a6cb205 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index a6bbc66d32c..ca194603e19 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index 554665cd3e0..3617e7dca8c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
index 6237b64bd34..d21d561aedf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index 6eae7c56019..2b9cf950625 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html
index 5592aa5d074..fffd1490fee 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
index 758ab576720..ab66756f26d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
index 35a5049a54b..8ee2450b5c6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
index 851b077e6a2..6b84a807dda 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index cd93dd64a82..3f368591eeb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
index 3cdd172581e..ad08efb479e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index 34be306a1b0..e7a40a8f5b5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index 33fe33fb1e9..f3a1ceb2485 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html
index eecbe272b07..f742fedda5c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index 90f8d6aa6a1..fc5ba70b0f5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index 8f88eaf53e0..bee7e7c7dfa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html
index 3df62ffabb0..7bbb4f14eda 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index f9961c352bf..b318b3d1b52 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
index 4c124d2982c..a245060678a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
index 29b6635f969..618f72716bf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
index 501315b2bd4..9bccee1d35b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html
index b8b2f5ad637..d134273d38f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
index ddae157a6a2..f33f2a41642 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
index b484454134d..ec0f304dbd4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
index 2219a9204d1..1283487e5f2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index 22559b1097a..10f7d424f2a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
index ddfbd4e197e..4b988f93a4f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index 23df7f0ad7c..3989f871abd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index 767c138725f..393b5c8f2c4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html
index 414cae5d65e..da1a319f11d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index 081b8b55fcd..51e7b9f026e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index fd3a69a85ba..c3ef83c913a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html
index 65a3a532696..c3e754769d7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index 6fb1b31b1ff..36d54be09f7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
index d8ff89441f7..8f5729a5ff8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
index 58fbc4829c8..ad5192f22be 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
index 229787117c6..bff291d441e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html
index 7b79cdeb432..38d2b85996e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
index 2a421f84652..4c6c66b676c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html
index df23d02dd85..cd8d5a5be9d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
index 0098e8f3e10..9f3da6f3ab8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index 6254fb8c761..16a0ea6f259 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
index 8454f0665a8..ad1fb82a092 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index 381737defbd..9f2b156b000 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index 7b600cbbd4c..fede3d587f1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html
index f6631d88424..433f7e593ce 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index 4f087234601..daed62fc5e4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
index db8e7be2376..615d560eeb1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html
index 5a335d0863c..dac70645d79 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index 04027e95f07..dac34ad4b55 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html
index 37037229b11..c649d8dd535 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index 13473d515af..1c621fddc14 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
index 82ee6907051..d8b420b1cff 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html
index 333f687308a..4fcae6272f1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
index be0f44caff6..144995f92ee 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html
index 74428173606..bd0400245b5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
index 619ed34a331..93c9e35cb17 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html
index 015a044daf6..edf049b1968 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
index 2b3c2527b36..92eb517ea4c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html
index f3110e13018..ae73fbcb869 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
index 02d91a903e9..37b90838457 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html
index 064eea5a3a1..9f077babd83 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
index d92098a3114..57d7d3a04c0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index a8f6d4c2b00..e857f4c7371 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
index 22b20d3b146..1b49b8f8273 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index e4c0e8e6993..44ce1077bd6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index 30a7422fe64..84bd7f15785 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html
index 99c436d7fc8..af062631476 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index a94ce6d57bc..c05be86fa28 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index 9f262c08298..ea519ad8b0f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html
index e4d50953a68..34b77789872 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index 3a3e505e007..770a09f7085 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
index 8cf8a9db06f..734bc6f95c3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html
index f0e9bcfe4ed..d050b563c4b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
index 9bb9159faae..dab9d524b50 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
index 0d756694501..84dea491dde 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
index 66cad981714..7b1cbb26b03 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
index 373a9a1fb9f..99c2a35a24a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
index 0661bda2b55..74d96730f03 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index 95cfae3151e..9ce9bede537 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
index 5631be4380a..506e55c7920 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index c5f2de32e71..bbab94c8bbd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index e676621b20b..ec567113e3d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
index d1f431ffde7..b8e5a1e0abc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index 10ba9c188e1..c4c455d4c18 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index 78762fe53c6..7c00437264b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
index 8580bf41ea1..f7e611b0325 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index 740cca8ff16..e813a79bb07 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
index 38096523b07..b399c06afde 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
index 9d1db30f66b..e9329317d5f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
index f28bd6734a5..2139b0b14f6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
index ad1d0d06a66..71695073c1d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
index 52ea79ea3de..5e689a46008 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
index 45bc707ab0b..397d206f62d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
index d80387047c9..0ccd881d9fa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index 6465e10c905..e7e41b63db2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
index 413690e8da8..03081d0abfb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index 602ec76bdbe..18ce9743bf7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index 1a987e7f595..a5950befbbf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
index b7d11350862..f8a80aa5a06 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index 312c8d556e9..2e5e19e6251 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index ba9d5d08f7e..c7ebf4abcf5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
index 93a164d270f..3a9187bcf99 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index 9b8f447e514..0cbaa017b59 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
index 8b1a8ea3d04..3737ab6a8f7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
index d40d7b41133..4c384414f31 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
index 65bc469879b..037b7a011e5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
index 69c724f4eed..0cb67fe3056 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
index cba7210bdf0..16fd9997ceb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html
index 54122bd8d5f..d38c1b6503a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
index a83eed31108..074b1865ee5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index 493f79902c7..9f644b23c8c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
index 4aaae188f74..b9ac4730a34 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index acf0c7aa025..f4342e37e64 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index 99da41e7347..9ed44e5a428 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
index 756dfb3cd2f..6dd14610457 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index 65ed223f1ec..821d533f6f2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
index 87ebfbfa0b0..06d6ba95b18 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html
index 0cf72a93e9e..f4357c15a39 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index 96e7d4e7bf9..53a65a9c814 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
index d6c28231cd3..73766d21c75 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index ee9ad999377..a534338697f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
index 09ccab6e19f..90f15d3fac0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html
index 36e0f5d34f4..4e4bd6e90a5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
index 69a8c2c1d09..8e69d73f9b8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html
index 4d4e8ef2ddb..400e9254333 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
index e33ca1b5f93..94ec3d20dfe 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html
index e966c29b628..bf854e14135 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
index 175441c9e66..45a441abd8e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
index f323ca74bd4..ae8a1cbea7e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
index 21828b7b73d..487a4e01ca7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html
index cadd6aa50ea..ed9dca4b815 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
index ac6d689b5ad..b48fa8741d9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index 92c2e4d40a9..b70b01384f4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
index eceedcb150a..8bca726055a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index e847df8fff2..5145f3b87fc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index 9cb83cb0c97..49aecc71a73 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
index 700d95828b0..8e306510727 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index 73c907dea43..e8cbb667722 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index 2b7786cd384..348ed773848 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
index 15ff14f65ce..72ff5190be3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index ba8411200fd..d790e13840b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
index 60df8dd4824..1a05902082e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html
index a119d66bea1..5d798f540ba 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
index 47c8084c38e..a11d44f1750 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
index 8d4c19c4863..27be3854a1a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
index 14e928ea859..d781a3c846b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
index 0e549ae0d40..10d6d0240db 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
index ea0d402325e..692bceabc2d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
index 0acf101b8ef..560438ceb14 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
index 7026fe1d12d..e2e3c145807 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
index e8bb9ae8580..4d1c319f03a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
index 0c7b7122817..bc7ee277cb4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
index eca111bd511..7cf53822096 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
index f46299630e1..ec99ff4cd64 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
index 59943a3ee45..2b47852898b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
index 73f992b6557..a2b03cece1f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
index 7fc3541bc7f..1ed9506e591 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
index 73ba641f908..10d8d55e4fa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
index 172853a4fec..e5599ca5d60 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
index b2104f4cb59..5982a1a2e53 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
index c984c4363e8..d843f6e3899 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
index 7b61c262188..22e5916a660 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
index aa3b6aa07b1..32fc200c506 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
index b993d95afa4..1b402276e3c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
index a384aa04e3b..16e801bc89a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
index 4cb71bcbf19..3877ada9427 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
index 66abd90fd5d..1fc0adb4d09 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
index 7c366c1080e..190220f0161 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
index 11683e44beb..fa4064bb6c4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
index 61709372817..ce1a841dae7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
index 594c2984df6..c779d149464 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
index 0a4d82c7eed..949c1235c23 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
index 7eee32a0406..d24966f203f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
index f92bf349cff..5a995aa042c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
index f17556c54bd..08319d5faee 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
index fa91f2cbb38..31692cca460 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
index ddd0fd43907..dd06b82cb0e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
index f04cea14e66..b5c99bd430a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
index 18dba004881..06780d9504c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
index 9d8b2b2c4e1..5e57d9aba05 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
index 2befacac7af..ac2b34d4516 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
index 988c99d5c60..3db9b5d5ff6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
index 7588d84e093..81023157107 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
index 3e2b36979fc..9cffc3a3e9e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
index b26c3efdc2a..77090c12734 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
index c7c348f90ba..e36ed4dd893 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
index 126e278b4b6..90de6fb92aa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
index f22d6d87b88..a483e45c53f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
index 90dd8881d53..88e761fadc9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
index 8dd055d71c3..ab9b34004e6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
index 32248c73940..2ae899937a5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
index 4e41494b869..318ac0f04b6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
index 08973c57153..ca48b235a3c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
index 54629cb45b8..1556581d911 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
index 86379152972..c0284a4616d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
index 1e66182f098..8d701f4364a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
index 289a4a50700..3ac0dcc9512 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
index 4d44a10b764..3450d8e1de8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
index d76ff641aa5..2aed29beb92 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
index 37d4e3e46e7..594eb72381e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
index 2757dabaad9..6531c27e787 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
index 8a405470c4a..f3ea627adf9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
index f5c690b8bfb..6abc50ecc59 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
index ba1424c0618..6f11fcc8b05 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
index 7aebb65a521..2a7ea1cedfc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
index 8d145be6b4f..dd9cacd1024 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
index 6d334876d90..67d90cd44b5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
index 941dd867f2c..c6962cf03cf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
index 41e0570ec78..d7f3d697bbb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
index 1af12eb18e3..8076d219244 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
index 8f72529b6fb..7512b2edb96 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
index 36e5d0a32c8..61a4547ee83 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
index 87cc414978a..23176037138 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
index 41d8f63f2df..d256320b428 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
index e9082a8036a..54a2aeeabe4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
index 731cb633995..d2f96231f11 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
index 94a1ceca87d..39344d054d2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
index 0e0fc8e5b5f..aa394e3a5a7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
index b5f8a4cbd3f..b1cd787f682 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html
index 8da4f3b3be0..632f1e32a0c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html
index 424221d9414..2525a167f46 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
index bbc8f26a583..1d754d24a8a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
index d373139d1e2..8776fdc0083 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
index 49468d12539..ff1f271128f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html
index 84f4c4707ed..9b189b5f669 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html
index e7d9438c14b..b190d3b199d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
index 5f8f6c1e792..84bf6dad89c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
index 44413d7b167..d7efdd2da6e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
index c3be3878ed0..dd169e50c8c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
index f4800516d7e..8806a014de2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
index ce60482bd76..e4ce94ad2b8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
index 5714a7e068b..f1fbb2b4179 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
index ca5c1fd4b04..1555a3d827a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
index 934fb53a6e0..7e27cfdc320 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
index 755075a17a1..b716504830b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
index 56c1bdb7dd4..0c8e45be875 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
index 319db6a902f..22b88b8b66f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
index 98643446686..ec43372bfb1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
index a70bbb7ff13..88f90ba8245 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
index 2199fbacc2e..5f24b6e4dc6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
index 0038a1a78ab..0d03f45be56 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
index 8555bc6ccfd..b289aa53466 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
index bd2014b069f..e7001e502cb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
index b519ebcfbc2..903030acab0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
index a70f22d69d0..d0d28622838 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
index 633938985b4..b6c3033e8f0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
index b9eefbc3042..d714cf6cfcf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
index 82fc3b11440..5c37342fc29 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
index bbcbe233fbf..219a866303d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
index fd270955f74..bab1422ce4f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
index 4739c58478c..dcb2fef2e5e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
index fe6f02837a2..4afe764b747 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
index 80f337f9e74..59c9006ac00 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
index 5d0f8168ca8..ecc047cd0d1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
index 3a4fb95e825..3bc5d625b4e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
index 20c2f4f497d..f0b53109a4f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
index d3ad1f9c424..e3819a3a25d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
index 5de6a24aa4b..b6ac8b10fc9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
index d39c95d82dc..2b9112f6f12 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
index df9f3a83989..9ee2002a7c3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
index 729839842ef..2c4115e98fd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
index f5e5c5230c1..6f2bfd58ff6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
index 5e03688c431..b10591c4cd9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
index 346e401ef9b..b7fbd2643d1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
index 27d89b3c0cb..da50e5c4fe2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
index 045dc06177a..7830d6f47be 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
index aadf7177746..99dd29eefba 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
index aada3951f96..465007eb754 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
index ab255afb9bd..a88aa71cfaf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
index 9bbbfb72fcd..3f8cae05264 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
index 6d7a54cdb11..d92b1c116cf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
index 8117e29c06a..d8951158b03 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
index 34859ed87a4..da4812eee49 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
index e73908952d2..9254b47bd74 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
index 0080977a727..3dd09242a86 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
index 155bf01095a..14a541ae27a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
index 7b3442d29e1..1763d19a642 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
index fe2b40c58d4..9ec70b6f80c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html
index c0d87fa3202..52d5a74214e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html
index 8586b96fe8b..dd0c6631674 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
index 18f3dbc804e..4f157deb995 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
index f296512efad..7d233267d31 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
index 8eaeb5cd8de..a1e1b9da5b5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html
index 548025dafc3..b2bbee56b96 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html
index d6e828c54d5..01c45482b29 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
index 2e459e3d059..f31661fc41c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
index 0760ef944d8..68c1c1076fa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
index 9ca4512215a..c301290fa9b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
index a8ec1e6acf1..02109248fbc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
index 5fdacce40e7..d8de5bbd974 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
index cac271986ec..4a376c18d6d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
index 7023a52beae..64d2fced4a6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
index a6be79bcd4a..b6966365114 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
index 70602133f84..591f211dc02 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
index 27a95b7ad14..fc88896bc4b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html
index 0f00dc41185..0c23a10a2dc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html
index 410b5da8bad..05d3c57afef 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html
index ee981716bb1..649fc0bb3d9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html
index 7f80e3dc613..ceb1df9c825 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html
index e1acb81c2ed..518a983bd0f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html
index 8f524a23ecb..1891f73b445 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html
index d1d3bfbf4cf..0510bad2d50 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html
index aa2b89c0219..36d2e8bdd19 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html
index 3d35d85a8a3..9235e2fab57 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html
index 6185377c16f..4ed01baae9e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 9e10c7fa348..1d76bd4ee31 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index 6b6302a6a3e..ea4a9cd9a70 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index bcdf715662d..113c6de0b3a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index 18ec84b8a53..9a13daabc2a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index 07bcce770a9..d611bb5ef5b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 81c5c0b89b3..e6a2f230bc4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 3e08734ae73..61ab8977691 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index ad88c2de7a0..8f69b50885c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index 62cfcfbf644..00ec7fdac74 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index 867f86fc937..c36fc8dd987 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html
index 8ab2c077ffc..977b03a760a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html
index 14ffec0f822..6665152dcba 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html
index 1dd3145951f..b3212e1130b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html
index fbda921ea18..ebb494d4ad4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html
index 0ba667d9c74..b43d0d9d83b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html
index abbc2d80fca..0b7fff638ff 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html
index 71b1a9038a2..95b684b4ffe 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html
index 6466b7f149f..aaf4952ceda 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html
index a86dca24c37..e812d9a3b84 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html
index 6936906ab3e..70e0de3d4aa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 44b03ee27d2..ed76f75b539 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index f21693a2904..181b14f75fa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 5ecad4840a7..9f85cba2b10 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index 4a37ed845dd..873f53f0c2c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index 44d4afad9c3..5c680ed73db 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index e0135ac6550..9adb33a0ab1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index c03ac3ec36e..c01fdd4269e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index 81f8677c333..b72ab9603dd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index 79b6a081e17..f4d4be6a33b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index 0517a5d4420..690c3f5329e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html
index e49741ffb27..e64a4894af6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html
index 78028ea112b..6bc062c8a42 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html
index b436f264f46..58feb6dfd1e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html
index 7f0b239b625..ffff41d39f7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html
index 7d8657595e3..efb17d6a4ba 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html
index cf0764bda25..ce5dbd7ab29 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html
index 68f7480b4d9..34c1e306646 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html
index 713b5eeb4d4..07d55711174 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html
index 5ce05593ccf..dcde036dca4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html
index e1b43a7bd76..f5efe8c0763 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html
index 57e841048c1..95939f1e55d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html
index 220448dd230..40634459043 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html
index 1bf99f14024..a520b09e762 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html
index 4b41fa5b88c..a1284bdf979 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html
index f46debfbe65..c4d04afdb5f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html
index 7642d2f3def..585b2736091 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 66928c51c3f..6f686681546 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index 23dddef080c..d7cad6d1aa0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index 41eb7eaa35a..e5d8f02cc5d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index fa964a4a4d6..16cbf34746c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index a973b979eef..14d77416a42 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 8e6ca11f3f4..778169fc059 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index 7073af2d60e..fd7e6df3b2d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index 6554f6cfc40..af30f362906 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 65f8a5621e8..53d4bc14c66 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 9c0a097c4b1..b65e35e7faf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index f456395c4c1..2e774aff9a1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index 6943ffa982b..44d5a7e8645 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index b14bb43a99c..e0a1190722d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index b9275cb0f0c..862a53dc05b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index 947e631d1bf..78f77cc46ae 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index f6c8623a069..fcc8004d96e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html
index cddec2b7421..9db05933d76 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html
index 08135c2a892..e1cd5ce7490 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html
index 37fb15fef59..e8966a3dd40 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html
index 3c35f062276..5ca9fa74e7e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html
index 0c49b4e91a6..3756bc90866 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html
index bc930390574..de03c558be7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html
index af7d1df7a86..a47402f8e5a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html
index b40e40125ba..55d3eb108d9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html
index fe66263f789..1f4182fc9b8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html
index 4f5483753de..1df1aea6386 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-insecure.http.html
index 80d2dcd0787..e6142429459 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-insecure.http.html
index 695afae6037..25c47754396 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html
index 16c752ce04c..5098411274b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html
index 6acc89c80d2..ce461d48838 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html
index 7620c016052..595ff8cda81 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html
index ae16346f3ad..25628c57045 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html
index 118bb0a3c45..59b5540d537 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html
index df71263b21b..90c9c062897 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html
index c71cd293d23..c0c4d57a6b5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html
index d5979d7ab66..df3d3caf697 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html
index b6bedeeb00b..12cd2108c2d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html
index 7baab77a09f..afa379cbe44 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 693c23702ee..69ffdead833 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index fa61f3528a7..0310cd68153 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index 316e28af94c..85d66187d22 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index f08708b1e32..2e4e2e4b0e9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index c922dd30265..21a46331bdc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index dbbc0646412..393b25128ec 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index cd93f802cad..5c96b21ab4c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index 2ce4f8c4f35..c5715052dfa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 05cd14306e8..3bc071771cb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 6c0eee6a973..4db9193f982 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index 55f137e6d5c..59ce04e0501 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index c13e87d458b..c3fcd6c749a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index ed886aa2410..9f60ef4828d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index 2cf0c49c10b..fdcf4ed4b4d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index c06e5fa4687..a9cb84bd57c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index f29aae30d57..4188c706213 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html
index dbe403fc39d..5c7e811b6a2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html
index 5d8c30513a5..adc20b10272 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html
index fb54ac71aae..14c5f88565f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html
index 4e71ba5f122..1f7660e4b44 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html
index feb537fbc23..2a8ebc51613 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html
index 6dba08c88de..52204f86a53 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html
index d40ed50fffe..b9276fb2f6b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html
index ba6cc74c474..9ce53940582 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html
index 285c361d1d1..16f65d24374 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html
index 29976794882..9178670ec75 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html
index dff241107ec..2187ed65451 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html
index 6d11862edca..9481c4e3eef 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html
index 1fc31fe398f..87189f7a041 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html
index 4a8a1f0488e..d91479b1687 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html
index 68b177b6af3..04f2d1e115e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html
index 68a648275fb..c0a3a3fef35 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 7b1ddac6e61..a7121fa4ed7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index 684dcaa146d..5c945e119f7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index ecfd82d0630..fa6bee08e75 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index 7071663d634..87b9c1894b6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index 9d76145215c..b09d94eb7bb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index f515e1d8a2e..4a0abcbac66 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index 9bba4f399ab..fda4a75c834 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index b3d45d73923..42eed76eb37 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 0faae4a906a..575447c7e3f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index cc26b0961b8..03ece498654 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index 94b42818407..dc66954e278 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index ffb2366aa46..e2302d26f20 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index b67826d7755..2ecbb3bb883 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index 596550e8999..ae5bac974d8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index dc8ee2a8f45..b2c6669de57 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index 266d4ff2673..72bc5f3adcc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html
index 2e49fa6bc31..c216eb8c8f9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html
index 0e1f1375da1..a770bc11c7c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html
index c00e3501c97..5d6f7b21463 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html
index 65aa8b72ecd..3612fc08b2c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html
index b3079d2dc9d..44ce34312a3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html
index c3ef7af0439..cc9bcb48c9f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html
index d21951e8997..dd271801aff 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html
index 7077dfa1271..3818bdb2306 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html
index e6b8211824c..e3a8560e198 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html
index 28a143047e5..bb969a6b137 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-insecure.http.html
index a74c968cd6f..c2d2eef0933 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-insecure.http.html
index e75274330b5..65f61af96c3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html
index 06e0cf6ccb5..f96147aa9f8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html
index d9cfc360d9a..15f8356c486 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html
index 882de7e13de..7b37f77b0a5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html
index a567c338861..2ee6670f1b4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html
index ede59d3c13d..324200c0809 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html
index e9b7a295ab9..7679e7f4c3a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html
index f9e58ca6f78..01429fc8d58 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html
index 2c9beb9b272..35a67d5cfe6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html
index 2da9b429ec7..6655e6609c7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html
index 61b40b55670..cf425621db7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 3e10a769b59..3bfba05055e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index 3dc9ca4eded..7682dc3dcf8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index fa5788b514d..f438db21fb2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index f226759df6e..d25fb8468a1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index 263ca22b550..96cdc93e1ca 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index e631d7950df..f698ba3603c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index dd777e20b01..0bc65f1d001 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index 3666ca93a14..c031a4c0d23 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 083863b0823..8f40cb489a3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 73e1f65bbaa..af4f0f32900 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index 9b8cb3a1d8e..4a335ea3f21 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index ec76e41ddeb..b0bbd0bde31 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index 7f76db13d25..9365b2056cc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index c6dd5590c15..f8f378e955f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index 8ebdfb9f152..d1a685be521 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index 793aef76ed9..50a5f8e2107 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index de1463b5d3d..66d64058bdf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index 5cec2348d22..6af2ee1d078 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index 0f5f5353dad..1893dfae743 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index 67f62b51cfc..3162697bf32 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index 0185812ea27..c9bb4d2fe73 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index b13d43aab68..da49cf91783 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index 733dd399da5..7a6b6abaf70 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index 966f10b28f1..01a91c0b38a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index 3001dbfd966..245bcdea2f0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index 308d22db03b..e428457354e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 6c5e16e343a..90568a2f215 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index e5171dacac7..6bf526dd44d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 518fc5ca927..6a3de7df386 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index 07c8d14f050..787fd136f0e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index 307ec94547f..5412f5c774f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 94a45bbf40d..7c196b7310d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index ff3a4d5f906..b65dd714740 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index 5e202a4c467..8e4e673295c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index 437c1a502c4..9e225754657 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index adb575e8fc4..411d6546f60 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index b368130fe63..362bb7300b0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index 6be36059447..33929b4db8b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index 29a5417f753..6e348099402 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index 1d19df2c20d..f9c98e42509 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index 29cec56f83e..33192628da6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index fc158a9c9a5..c7b24eadaa5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index 0636fed2349..a32db594099 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index 6ee44808bf2..48a05510e84 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index 1e97bb824d0..d9691a5f278 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index bf2a2136ac4..112cb07a1c7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 92f584e8be6..c577811769b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index 3a3d0cb3912..fc3caa7db41 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index b1771d76682..562b343c074 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index a2b64ec7a29..a5efd1ab5ac 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index 10d67abeb64..5111816d194 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index c5d55deda1d..88a8d6ed037 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 8b1c993d266..0abbbc31a55 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index e409624d7f9..f9bd0ffa568 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index d968e806708..5235d65e67b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index 9b6ea47cd8d..ca82f796aa0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index 3a37854f348..eb2728ba4a3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
index b8bfa369cc0..6db13b83ac6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
index e7abb5524af..a775c929188 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
index ee0f6a65e9c..fa5dd4e3a5f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index 6e0f4dd793d..ddc08785793 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index 6dcc1de0c48..ef1e1e1c630 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index dd867e250bf..4404426bc7e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index a8a664fab21..7bac59bc750 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index 778eace9456..acbed1072d5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index 151cdf90d97..c6cf50265cb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index 8356d3b1842..de2b97f3267 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index be8889a9264..51e66f2a9b2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index f579e962710..36161da8f3b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
index 6771dfdc2cd..a11910b00b8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
index 82b6165bee1..9ba64a59d56 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
index 850b62b0595..af71a315110 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 112efd4056c..83bb4f5aa6f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index 8dd238f1781..8d8435e4538 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index d0c92c8c333..2d324453c55 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index 80aba4f30ea..88065cd16cd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index 76edcef00e1..d979933fac7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 0c9a64d75bf..f53a953aa7e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index 7261e079b52..67600bf9775 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index e3d99ada994..e27563a4421 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index bf4f76c422c..282de2a68e1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 3568a5853db..afe01d98b43 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index 34678b6e0bb..c385eeb8cb6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index fd6fa84b8fc..d3b18a67385 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index 8e2f26110c3..ae435dedf3e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index f1ef4905ab9..ac8edef8163 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index 882ec58e84c..5288baf690b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index 61222c061b1..76a320a9bfe 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index eced7c91947..bd748b6d848 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
index 07324af6df4..428ff861548 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
index 74f5a7ccc92..6669ab212b3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
index e0c913583e9..c35d7cb17bd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index 28616e8af6f..01ba2d5b0bb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index 4fb70527b61..8fb9370cb75 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index dc4f644b783..de6638c6d18 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index 829b2b072f7..ac920cb9f4f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index e2be71dd9ce..a6eedfd236c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index b3d3dc54a0d..e0e92bf589e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
index 82b67545c48..4586fab184a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
index bb8d797d0cb..9e0900d7f25 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index 56fdc7923fd..d8edc558d40 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index 62397c24847..b68fabfb9d9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index 183620ee89b..c9623dc3be4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
index 1be3aa77d06..705a94f449f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
index ea834022713..e751a96832e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
index 1b30f714d08..ee798fd77f6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
index b5880bda93a..86290413695 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
index dce61d41d78..34909cb71a1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
index c857f4c7695..8baf9eec686 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
index 1f137283c62..3462a51251b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index b25470749eb..3dc212e9fec 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index 4a82c294452..c25f716b032 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index 787d3afc7a5..ca6b4320645 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index 0a1d40c5f87..a22890c0756 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index 999c43e8b1d..5592f7a47a3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 6330560d946..af5b5b495c6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index 4681722ab17..ac79d620e75 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index 1487f964536..d3bd99156f1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index ddd876b91af..3aa49c4d9b8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 6c92b8d5166..dde11eb542c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index c2fef2eab9c..b6be0bca28c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index 51b0a806941..face97dda01 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index ab62bdbeed5..32123fac255 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index bd5bbed36eb..8efd849727d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index a3d7e847759..961cb2b4a94 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index e264bc35cdc..5f0a33f4c24 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index bdfe9f7b932..8bece44d3ed 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
index 96cb2460459..02c0d382c8d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
index 97b2f49424e..2167cd19bef 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
index 41c90bdfd05..464d38106ca 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index 005b0fa5eb7..6bddb18878e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index bb240bee618..076e51049ad 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index 0d6b7b27218..8e9b6554fd1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index 09d9594c266..d78d22da601 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index c83cd66182d..ca2079d4020 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index d9ed4f6c0d2..5d9aa9a967c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index f060d3b9999..1eba7c478ac 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index d37724e7c61..090d7177468 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index 7c9c53f86f7..6f8a8d12291 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
index 2b04c50a425..68836a1e20f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
index 064da1b6986..de67eb3147c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
index 7046e6e1474..f29a3130e4f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index a14d6f79ced..85ffd5a6205 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index 25557dfb8e7..66c4ed68e7d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index f3ce31c69db..6539ce8496d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index fdbf7a78b19..4588734ecf6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index cf16f8adef6..9b86f363499 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index ffda52304cd..7271188681b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index e013b680fef..c26d30017f9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index 1a1b2404463..70c9c8160bb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 5bfd8faa1d9..1171eaff907 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index d648738223c..3f958fb4ae8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index 25f01ca1b26..c37487a8177 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index c51a797d372..f7aeb60176f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index 3562c938a09..d3696d83865 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index 50994e295cd..f6b60e3e3b4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index da91cfdd2ef..d696ac79937 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index bb496aa3f04..3e2328303ef 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index 32ceeff6b39..7730443312c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
index 0179180e589..cec306036ef 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
index 3b9d5beb6a3..479d8c56ecb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
index 01c5646b14c..b551580619c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index fccec81bbcc..b1d9cad4e67 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index 5840859b4ef..337b2ee3f6b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index 4e93fafee05..47e90041bdc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index 9a9490e666f..2199f7a899f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index 9e1bd3a1c08..2657884e93e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index 46a7a33c3ff..40c7e037034 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
index f60cef60c73..85886baeb2c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
index 3ee6b651a90..9763a1973ae 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index 6186d57f3f8..ecbf2b83c28 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index 08a6df4fdb4..c0f5c866b50 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index 8bf116b873f..e747f570bfe 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
index aa874fda922..7fd8ff4d194 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
index 056494df00b..beec47c1edd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
index 7d18b730ec3..c4070eca035 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
index 8a85ecfc756..e5ec2f3a1b1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
index 3fe96e71d48..0383a617eaa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
index bdfce453e8d..7ce14526ded 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
index 6e29cc16ad1..d6131965f7e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 8f4342bcdbb..752a2bb0832 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index dfc4b9792ab..489181e7a6c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index dfbc93f2076..e3a255bc353 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index 4f581e78348..b2c688bd1e1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index 610799d5e23..1677fde7fe7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index db36bbc70d8..995c0e605ac 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index 8f4eabfa254..31f622b9b4a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index e5acfb1b050..d5a472e0ffa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index f2a6afb83f7..86665bc9529 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 40dc6bfa407..caff3743136 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index 2bac0fc5a3d..2f14b230b33 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index 023680ab7e1..6205355dfad 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index fbd9be455de..d061c5f7e9d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index 1b2a3b3ceb4..6066601fb0f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index 0c002eff6aa..597c0a51676 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index 3aecaf52f88..1cbc16515d1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
index b803ec86857..cefaa9c97f7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index 1d4be3c7795..bd43802283c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
index 71515077026..9503d148222 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index 814b6d9ba1e..bce63cdb6d3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index 3bb8712035b..a57959714e9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
index 8a8a459f944..9e292c97c0d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index 04ae66bd22c..1fa9bf44245 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index edfdd5a4fb4..070e99e8f18 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
index 19bb2541bd3..980678e8168 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index 45216007e36..982a571ab15 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
index 0ae15d3a6f5..7e9c9f1e7b8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index 4947e50aab9..639c2ad1cf3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
index 39deeac307e..9bd40a44a81 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index 334ebae5227..e2b981ef320 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index ca1f0a68f7a..8bab7df57a8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
index f813f24a611..c2d2948d4b7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index d3272c43508..f1804350ceb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index 9c4d68109b9..fb1c255cabd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
index 2c445f16892..bde470822dd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index 384d6b4f05c..e28d725eff8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
index f1d51bf377d..699a9f8f422 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index 22800cf4b4d..241f87c0769 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
index ceaa0164ef2..e9c5fc2a0bf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index 5117c0f4dc1..2b77f9761e7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index d891987d39f..089c3c59254 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
index 246089208a1..f152defa15f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index 10fc2a00faf..6be7be59f2e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index 3fae7fde3c2..1d234b8d14d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
index 6ad3c317b11..fff0f8ba92e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index 5976b8fc94a..9adae7ad86e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
index 3a4c60248c8..5a74b6f4ccf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index 9d504a97092..256ffe7733e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
index 5fc928a3c7e..7875fa93b9e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index 01d2abbb84c..c6115923451 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index 2b520ff43af..2705d9d7ede 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
index 7a2fb09fc67..2edd407c673 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index 7612d5ef648..bed4da153fe 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index 61716199e58..e3baa436370 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
index 7c900a7466e..d4eefd63747 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index 4b307df8c34..60917b64e8e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html
index 3aabb1d6e6b..30b4a2439fa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
index 53ab93a3574..78f5cbfa1cb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
index ae0a512baae..efd83b24093 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
index 1360c04c3fb..aee2c19a068 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index e608f52cbb5..0bdbad44abf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
index e8b1059951d..cc62ce40894 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index 0755eaf96b5..44308b95416 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index 6c873e8f0ad..34fa48f5e7b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html
index e9d9d246902..a525fc603d8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index 78b871570ea..7ac73e2015d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index a38b20f1753..f213cd31bf0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html
index a7fd03c4301..8140af2fdf9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index 06b2b252f35..8e8241e6f81 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
index 49c3ec58e8f..f8f93288358 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
index 163b8c8a038..dc670ca1ad2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
index c2855013511..b10e0f2958d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html
index 2ce057e691a..ed9b5c0089d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
index 608035538d8..3adc05493c5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
index 046b2585986..9a64304c2e0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
index 59bf756b8ec..03a51f77479 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index eee0a3f8ba5..ab4c34366f3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
index 57f1a9d0407..db547eca970 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index fdb7033c4c4..931895b1d4f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index 7168479ac2d..0ef325faa85 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html
index 5689889eb33..69909e9ef80 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index 678d9552402..35115b87c2b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index 73cabcfd939..b9566357856 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html
index fccf299678c..1220a18baa6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index 174c0feac74..21df7bc75d4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
index 832ceb02ead..144c8bf1343 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
index 4ce77993505..46086730a00 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
index 664cb7e3dea..96faa625202 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html
index 2041b85a8e5..5e5c5f8200f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
index 2ce45af4cdd..d82278a75d5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html
index 038a0b2dd5c..928dcce4ca5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
index 78b340afe47..f4a83144a42 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index 12446ba1483..6fc3d594545 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
index 70a115d8756..e9fff3e4c85 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index 7a083ea6cdc..d6b38a0c634 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index 12871fac6bf..c399b479834 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html
index abd803c4437..93d63b6c2ef 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index 02e9b92a215..5e7717967d8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
index 8d97cd77bfd..7b67fec5f17 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html
index a3291b0ca86..d8ced7706af 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index 435281a74c9..e315f3cc216 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html
index dbdf2d6fb9e..fa86de29f5a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index e1643fd37fa..c7ee265f11f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
index 53cfed58c20..86ce965807f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html
index 4621243bb65..a0a3492f10d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
index 7882c1319c1..ff29153c8c7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html
index f9baeba7a31..ba0c3a2cf39 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
index 89acf024fda..67f6ce8b96c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html
index 9f43191303c..c1892cbd682 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
index 5e492ca9175..d40087f2376 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html
index f0824a22910..c3cb404fa45 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
index 54a2fc32257..e90461cd160 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html
index e6775088a6e..0ae217ed8c8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
index c2bccdf77ca..b55a2708a77 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index 79cd63640de..b092571cfeb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
index 4fc687f979b..c0b5209603d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index 3a24da90cac..9393d4cdad9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index 95154a9916d..b76378b830c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html
index 501e8ed242f..9025174a493 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index a49c2a05ccc..e197f94bfdc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index 77d22e91370..dd4ebfca68c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html
index 6ab0525a97a..057f2680f76 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index 22057804af7..5d87766d2de 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
index 980c4a9aa46..dbde82d2650 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html
index 42c0c4b6ff8..02ce7599d04 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
index efb989ee35e..a6c62bec6ec 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
index 9bc18f9d5ea..e4da9e99f46 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
index 15120a2dc19..2eeb2a71566 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
index dea4a85cf8f..3e8df22f781 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
index c46cbb6a159..24958f59132 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index e89ee7f8940..27c43706681 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
index 875901b2564..a3b987bf972 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index 82858ef6227..f390274ded6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index 775bf93fa3d..ddd26ce66a3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
index 41560ae8c18..79eaac29979 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index 03073d50e30..a62df13ca5e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index 5a1e1ccc64e..ff5286575a6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
index 5dab6717086..3fd0a99ea40 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index 50447b968fd..b53da6f22a9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
index e4d2e2c77c4..0264f09c393 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
index 374f5c0ea62..8258da32459 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
index f02d54bd7f5..90e0df722ed 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
index 8a372cee16a..ac71e83fd2a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
index 71778ee0cd7..6e38ce7a26f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
index 6f34ef1571a..ab9071628fe 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
index ebd930f6910..f0c3f6e6362 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index 18e6eb2b421..4595ec4c56a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
index fc44e3e254f..74551b6ea25 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index 5c882260190..0476d6f8440 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index ebf71f17538..12f9db6f8ae 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
index bf6262f26cf..873003b99b8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index f591cbef0a7..06cabeaf21a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index ba2d54d627f..b3b3b5de83f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
index e8b0aa9e87a..62caaa3ecf8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index a34ce0378b8..2872e8bc50c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
index 6482686b5fd..789b74b5593 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
index 2610bb06598..958547af2c4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
index 740895b805a..97413c48402 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
index 0f16cc626c2..99e9bf4c745 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
index 681dab44cd4..19639f8418d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html
index d72aeb785a5..8388262d65a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
index 77c3c68a77c..3de61cf23e3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index e5592cd0891..3522e360059 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
index a87451fbdce..01987663ea9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index 631e1477c80..724108608a0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index 0cbf66fed61..065d0185aa5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
index 43dc43d0401..2fffac47880 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index 7fe2baacff8..0a3500c570c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
index c33155b2999..bb86346321f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html
index eae3381ae92..63b5c5a76b9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index e1db3d1e59e..77bee4533ef 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
index 404392c8e44..1545ccb90b5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index 18cd15910ac..4f5f456c89e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
index 6fb87153b28..4c803b30288 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html
index f1f759257f6..39671be7f7c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
index 7a763d011c7..a0d247f675f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html
index bc7f41857aa..2f787fc985b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
index 34c72954464..4ad2229ff18 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html
index 6386f26a9f9..7ce79ded82d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
index e9ffeeba0ef..be77219b39b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
index e00dc04118c..5b3f4220a11 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
index d3cc95adfd8..8bb961f3f74 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html
index dbd4183bd7a..332f3826fe7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
index 6e07cfb0990..09c9f0636d5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index 8c54512a93a..71785bd2023 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
index 07e669ccf94..8a1b13d2017 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index ec2e9c64732..12403886df6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index da52ddcc879..a549e552350 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
index 38e401993d8..1dc5657fb2a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index 3ae164bf11b..e391b7273b9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index 759728b00b3..23220fba182 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
index 7b73c8ded47..8fb47741b94 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index 379763fc354..ef8036fc23a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
index 90417e90e71..ac23978e877 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html
index a4e1bee0d77..f6bb90e3ecb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
index 4780d0d4926..9f7db2bd801 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,8 +14,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index d4d48c5202e..93678e42af6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index bcd0a811b2e..1167119941c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index 55346939f95..558f6538c85 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index e377fc37711..4ea91857c49 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index 2b2c1b287c8..f243ee26560 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index e4d5cd7dc61..f335481c211 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index 2361a04f5fa..1284d299206 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index ce4ea6be8cf..852270205ab 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index 2dc068ac4e5..b4036ad1783 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index 87e94c62d01..c0907438fad 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index b495fd23305..2e1bb1ec444 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index 8d6e5f548fd..e9261bc57d5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 5fd5bf66194..3d46e709fcb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index fb46a40ab9a..0b778f4997f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index 5d37c9fa6e8..d5de49051f0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index efd91432012..d7e2a54fd1a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 6198659416b..ae40fbac027 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index 67f0f034fe8..10c558f7d23 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index fcfa56d773c..117dbf8543f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index 52400d6305e..c0d9f6c81a3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index 29c0ced3a22..2099d0da89f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index 7c8e98fa37c..7b12dba78c7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index e67e90c8093..729766edb53 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index 18667759ea9..3f7f04c97ed 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index b47279c1ce6..0fa59706d73 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index 997bbf49e79..9cd46c0db0d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index 9472829baa6..d913fd518ba 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index 3668aee53c2..dabd9cf66de 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index 2cd7df0252b..1c5a69f8f26 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index 3345a9ed2a5..08c5c1df2df 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 5ed0f06af2a..6edd0b6222d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index cb9ff640eae..ba34cf586d2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 8f981881466..6dc6e580fb1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index 8c134e9c3aa..1869a4aeaba 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index 7eb82506233..9370940f5a1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 35e905c392c..6364a6bc846 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 871679a6eba..50f9ef60600 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index ceb5586630a..104de66bb88 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index 3ea90747c0f..c253955bd2e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index 5b89eb7aedf..00058b3bfde 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index e750aa9186e..c7c15bf7f36 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
index 0665510a647..3c28f7795e8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
index a93c94af59a..c14f0f8a6d3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
index 6665a2f354a..0a7733497c7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index b380ce0c91e..7fa1acae0d6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index 1894667f01e..b21bad37d59 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index 033feffcce4..6ef1bfc0973 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index 1f6b62841e0..a1a9cc6e212 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index 88a3e42a568..bf66c513f8c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index 69d835c3d83..e00dbee878b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index ffa234c2966..fab4c375045 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index f92abf01b85..922da3091e2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index 95380577428..49b72b4b54c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
index b6191fed695..599ba30a37a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
index 635ec9d82cb..d456f4fec7b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
index 00848d6602f..fd6e2e0f3fa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 3ddbcee365f..b65752bdfbd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index 00cacb9060a..599558d826a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index 68b8f69e5c6..edc3544fc94 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index 9390b64fde8..0bc0ee85752 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index 1c12c9ca24c..1f9110ca000 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index a76c98066ac..1bcc264cf04 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index dd1c82dc6cc..c74f071263b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index 307c7621135..d1f0c2e1e91 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 30530e6636a..9569bbb4d5d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index d6e1c283c39..e527876ac0e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index 19666416a90..1e7cb029ac1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index f05d225d811..9f070f67463 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index efa96f50fab..a6f3cc71c27 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index ecc377c6870..7c2f24e314c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index c5b47ed3bbf..6a530fc09ed 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index f8b744f618c..5e6ab1985ac 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index 6a70b5b42a1..cc182c1098e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
index 36757f5dc62..6f84795a621 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
index c75ea8d74cf..5a17464ef25 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
index e765d82001e..d547c4b15d8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index 5d2c1268cdf..3e2b15cefcd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index 07850f1d2f5..6f34b7f039c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index bea31157fe5..7b3143e624f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index b1e6128a3ab..00840f73e62 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index 187644769c2..9d1a36f454a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index 621aaf86a28..f50ba2946a6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
index aa5a9ac86bb..ba6b200df2e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
index c2201e9c4e2..65131c48982 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index 2c16b549ae9..4076b3d0a9f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index 2c66e693d31..2ad2e9d5158 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index e6c6432c015..cd641e7b903 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
index f5b7e511b36..699a94f9a1c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
index 526e24ac4c9..0910fa386b2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
index 686d4feab2f..26adab8772b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
index 63195e03a24..54b50413161 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
index ec52992fd92..61dac7d3fe8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
index c0aef90b38c..0bba74c770d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
index 76e883fce0d..87df303a657 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 00e67dffba8..ba575736b5a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index d719b513506..47b497f2b0a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index 21b899d88f2..f284f6cf44f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index e83e55eccef..4f5cd420094 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index fdf3cf38c75..40e927d4da0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index ff768ca6241..fdece9a07e2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index b36050b5ed1..f1b517ebbf7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index 943ec5cf35f..5cf1f7c7ada 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 44cf0ddecc4..4b97c9b6c56 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 9df29013d07..1ae3c471c51 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index 5b392fb53f5..00f20b1e7e0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index 7d6be6e4dca..a39a72025c5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index 29c554a2fca..4c42aee6507 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index 2f60784c0d9..d03e62030af 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index 179877264a6..3eceeff71bb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index de46596f96a..eb30e847d25 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index d519295475b..7c2b2347b1b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
index 4ee0c81a535..a57e2a050a2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
index 1db8f0d9964..ac03ced7b71 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
index 5b1533620e6..f08ddef240d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index 30dee3506ad..1836ebdc756 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index 31b50bde1c8..65b503d1df4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index cea04e81a0f..bc7f9ad7cd4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index 0e646941205..3bdd36afe7f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index f99e0f0ae30..732d621c87a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index 1bbcfbb06d3..8dfe8880440 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index a35c885eceb..89cd0526660 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index 7e46eee5ea0..95976e0878f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index 3457d393c26..e5a62b3e07f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
index 690b427f4b1..00c5d396018 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
index 7c1838c5158..5a1c26f8ad3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
index b891494cb88..c1d5b4ccd7c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 4c07e9aeb66..c2a56c863ce 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index 58c6f098cc1..9c399c3bfce 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index 31da00276bd..60ab186daa7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index b4448f4dac4..748af8f5f86 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index a9c58e69fe0..0d30bade3fa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 71e9f32ec37..dddfbef0396 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index da7331ae14d..30ad89093ec 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index 8fea31f3c85..10b36101476 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 476ddd04ec5..9655342103f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index a583699ffbc..719669da9a2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index 6f60845874f..b15ff922c11 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index 88f9b2ff185..4aaff556215 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index c36005af7ab..eb55e13e77d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index 1b67733527e..4ee8c794105 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index 0003f46e351..5b8fa9cc474 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index 89749f24178..5504dabd953 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index 3e9b3473de1..e9054bff430 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
index 36911507e26..e9940a8d929 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
index e8487bca9fe..10b0d60b2f9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
index f3a2ea72782..391be7ae101 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index 4f089935116..020a95d3bca 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index 7cae21045ba..50269b158f1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index 59699ea0c70..8b4d43c07fa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index a0e4f7aae5a..181944a1b61 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index 39bc55b03c7..d93785c6000 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index 842e32d571f..7329e02bfb1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
index 15103438ba6..4f3f00a55f7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
index 37e4203474d..0c53605d2fa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index 39410f46c65..3a64fb26fe6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index 74c79e9fdd8..a228469d11d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index 5a66ee35830..7428dbf85b9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
index a32157dca01..ebb22260c75 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
index 7031f36f36f..39b2048c8a2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
index 6500c7f756c..b9819db1fae 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
index 5f10dd7f5e9..65be8f33e0a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
index 85ecb5e6511..abb3d72fca7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
index c4207cf8b30..87d2aeb88e5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
index 359326b1a00..1989f796e10 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 2f6ec65f99f..addd685a0da 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index 8378e3f1b16..4c15c563c24 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index 735dc7639f4..45f57513a6b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index ba6d9abb373..c958f31b91f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index 0d8231cfa4c..39005dc819d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 82296dc3819..a51d2fc5ef4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index 7a7c19a6d8d..9ab1701e208 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index 241ae8b8002..e34b1e98a32 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 57e56be5543..3e4e70070e0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 98738a646df..025b656bb76 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index 3e504c04971..600cdb9fc92 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index f48e258f093..e95715a1510 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index 59e01959a10..b9f74bb358e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index 32e8231f01d..3713018b868 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index 2d391dbbdf5..fb74c67677a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index 0bd9d4a42c8..001021fe4a1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,8 +13,7 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/update-registration-with-type.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/update-registration-with-type.https.html
index b712c30f71e..e7d3692812e 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/update-registration-with-type.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/update-registration-with-type.https.html
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>Service Worker: Update the registration with a different script type.</title>
 <!-- common.js is for guid() -->
-<script src="/mixed-content/generic/common.js"></script>
+<script src="/common/security-features/resources/common.js"></script>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/test-helpers.sub.js"></script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/animation-worklet-import-upgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/animation-worklet-import-upgrade.https.html
index 38e89eb8bd6..5f65f2357fa 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/animation-worklet-import-upgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/animation-worklet-import-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/mixed-content/generic/common.js"></script>
+<script src="/common/security-features/resources/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/animation-worklet-redirect-upgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/animation-worklet-redirect-upgrade.https.html
index 87d0d2aa2a9..0e2c86e83a6 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/animation-worklet-redirect-upgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/animation-worklet-redirect-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/mixed-content/generic/common.js"></script>
+<script src="/common/security-features/resources/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/animation-worklet-upgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/animation-worklet-upgrade.https.html
index 8a68b2d94ab..208e324a996 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/animation-worklet-upgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/animation-worklet-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/mixed-content/generic/common.js"></script>
+<script src="/common/security-features/resources/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/audio-worklet-import-upgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/audio-worklet-import-upgrade.https.html
index 56d7259647c..d8d44a6a0e5 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/audio-worklet-import-upgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/audio-worklet-import-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/mixed-content/generic/common.js"></script>
+<script src="/common/security-features/resources/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/audio-worklet-redirect-upgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/audio-worklet-redirect-upgrade.https.html
index 2e1984f6017..63848c60d8c 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/audio-worklet-redirect-upgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/audio-worklet-redirect-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/mixed-content/generic/common.js"></script>
+<script src="/common/security-features/resources/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/audio-worklet-upgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/audio-worklet-upgrade.https.html
index 91d52adbdd3..52f1c4d5f69 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/audio-worklet-upgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/audio-worklet-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/mixed-content/generic/common.js"></script>
+<script src="/common/security-features/resources/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/iframe-redirect-upgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/iframe-redirect-upgrade.https.html
index 72047493f17..4b4a21ce919 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/iframe-redirect-upgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/iframe-redirect-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/mixed-content/generic/common.js"></script>
+<script src="/common/security-features/resources/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/iframe-upgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/iframe-upgrade.https.html
index 60c5aaaf95e..53c9997ec2d 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/iframe-upgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/iframe-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/mixed-content/generic/common.js"></script>
+<script src="/common/security-features/resources/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/image-redirect-upgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/image-redirect-upgrade.https.html
index 69c3f1469e7..5c7d8934c2e 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/image-redirect-upgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/image-redirect-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/mixed-content/generic/common.js"></script>
+<script src="/common/security-features/resources/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/image-upgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/image-upgrade.https.html
index 5ab6306ed46..6f897050d48 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/image-upgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/image-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/mixed-content/generic/common.js"></script>
+<script src="/common/security-features/resources/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/layout-worklet-import-upgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/layout-worklet-import-upgrade.https.html
index ffc73afc42a..6e9ae4d36f2 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/layout-worklet-import-upgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/layout-worklet-import-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/mixed-content/generic/common.js"></script>
+<script src="/common/security-features/resources/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/layout-worklet-redirect-upgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/layout-worklet-redirect-upgrade.https.html
index c9c95317001..d04165f32c3 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/layout-worklet-redirect-upgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/layout-worklet-redirect-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/mixed-content/generic/common.js"></script>
+<script src="/common/security-features/resources/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/layout-worklet-upgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/layout-worklet-upgrade.https.html
index 7cbdff3902c..191ac12d3ca 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/layout-worklet-upgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/layout-worklet-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/mixed-content/generic/common.js"></script>
+<script src="/common/security-features/resources/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/module-worker-import-upgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/module-worker-import-upgrade.https.html
index 0522051ebd4..22c1600e136 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/module-worker-import-upgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/module-worker-import-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/mixed-content/generic/common.js"></script>
+<script src="/common/security-features/resources/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/module-worker-redirect-upgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/module-worker-redirect-upgrade.https.html
index 132663e3652..936a7944b46 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/module-worker-redirect-upgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/module-worker-redirect-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/mixed-content/generic/common.js"></script>
+<script src="/common/security-features/resources/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/module-worker-upgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/module-worker-upgrade.https.html
index a4be5ed45a9..6de610a302f 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/module-worker-upgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/module-worker-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/mixed-content/generic/common.js"></script>
+<script src="/common/security-features/resources/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/paint-worklet-import-upgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/paint-worklet-import-upgrade.https.html
index 96d68e260bb..da52df5c998 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/paint-worklet-import-upgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/paint-worklet-import-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/mixed-content/generic/common.js"></script>
+<script src="/common/security-features/resources/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/paint-worklet-redirect-upgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/paint-worklet-redirect-upgrade.https.html
index 0675c6ab0cb..b70c103da4c 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/paint-worklet-redirect-upgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/paint-worklet-redirect-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/mixed-content/generic/common.js"></script>
+<script src="/common/security-features/resources/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/paint-worklet-upgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/paint-worklet-upgrade.https.html
index b4f1aac04de..3f2790a1092 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/paint-worklet-upgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/paint-worklet-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/mixed-content/generic/common.js"></script>
+<script src="/common/security-features/resources/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/support/generate.py b/tests/wpt/web-platform-tests/upgrade-insecure-requests/support/generate.py
index 2676d0c68de..8c8cca21273 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/support/generate.py
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/support/generate.py
@@ -13,7 +13,7 @@ template = '''<!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/mixed-content/generic/common.js"></script>
+<script src="/common/security-features/resources/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/support/testharness-helper.sub.js b/tests/wpt/web-platform-tests/upgrade-insecure-requests/support/testharness-helper.sub.js
index d7be710dd24..70378edd15e 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/support/testharness-helper.sub.js
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/support/testharness-helper.sub.js
@@ -1,4 +1,4 @@
-// Used by /mixed-content/generic/common.js.
+// Used by common.js.
 function wrapResult(server_data) {
   // Currently the returned value is not used in mixed-content tests.
   return null;
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/worker-redirect-upgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/worker-redirect-upgrade.https.html
index 19fbb1fc5af..486965c4386 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/worker-redirect-upgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/worker-redirect-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/mixed-content/generic/common.js"></script>
+<script src="/common/security-features/resources/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/worker-subresource-fetch-redirect-upgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/worker-subresource-fetch-redirect-upgrade.https.html
index 91ff96d978c..b2ce2cfe404 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/worker-subresource-fetch-redirect-upgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/worker-subresource-fetch-redirect-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/mixed-content/generic/common.js"></script>
+<script src="/common/security-features/resources/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/worker-subresource-fetch-upgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/worker-subresource-fetch-upgrade.https.html
index 9fb4f853452..1639363e898 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/worker-subresource-fetch-upgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/worker-subresource-fetch-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/mixed-content/generic/common.js"></script>
+<script src="/common/security-features/resources/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/worker-upgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/worker-upgrade.https.html
index 9f2cea16b93..2b0a6a757a2 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/worker-upgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/worker-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/mixed-content/generic/common.js"></script>
+<script src="/common/security-features/resources/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/support/scroll_up.vtt b/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/support/scroll_up.vtt
index 0b88020d29f..c2c2ff36ba4 100644
--- a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/support/scroll_up.vtt
+++ b/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/regions/support/scroll_up.vtt
@@ -1,4 +1,4 @@
-WEVTT
+WEBVTT
 
 REGION
 id:1
diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre_wrapped-ref.html b/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre_wrapped-ref.html
index ac208c8f129..f568217a147 100644
--- a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre_wrapped-ref.html
+++ b/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre_wrapped-ref.html
@@ -18,6 +18,7 @@ body { margin:0 }
     width: 40%;
     font-family: sans-serif;
     text-align: center;
+    overflow: hidden;
 }
 .cue > span {
     background: rgba(0,0,0,0.8);
@@ -25,4 +26,4 @@ body { margin:0 }
     white-space: pre
 }
 </style>
-<div class="video"><span class="cue"><span>A A  A   A	A	<br>	A		<br>A	A   A  A A</span></span></div>
+<div class="video"><span class="cue"><span>A A  A   A	A		A		A	A   A  A A</span></span></div>
diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre_wrapped-ref.html b/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre_wrapped-ref.html
index 4acb7779df9..b8b6025c31d 100644
--- a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre_wrapped-ref.html
+++ b/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre_wrapped-ref.html
@@ -17,6 +17,7 @@ body { margin:0 }
     right: 0;
     width: 50%;
     text-align: center;
+    overflow: hidden;
 }
 .cue > span {
     font-family: sans-serif;
@@ -26,4 +27,4 @@ body { margin:0 }
     white-space: pre
 }
 </style>
-<div class="video"><span class="cue"><span>This is a test subtitle that most <br>likely 	will span over several <br>rows since it's a pretty long cue <br>with a lot of text.</span></span></div>
+<div class="video"><span class="cue"><span>This is a test subtitle that most likely 	will span over several rows since it's a pretty long cue with a lot of text.</span></span></div>
diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre_wrapped-ref.html b/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre_wrapped-ref.html
index 1c91eb7578f..a681294fecc 100644
--- a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre_wrapped-ref.html
+++ b/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre_wrapped-ref.html
@@ -17,6 +17,7 @@ body { margin:0 }
     right: 0;
     width: 50%;
     text-align: center;
+    overflow: hidden;
 }
 .cue > span {
     font-family: sans-serif;
@@ -25,4 +26,4 @@ body { margin:0 }
     white-space: pre
 }
 </style>
-<div class="video"><span class="cue"><span>This is a test subtitle that most <br>likely 	will span over several <br>rows since it's a pretty long cue <br>with a lot of text.</span></span></div>
+<div class="video"><span class="cue"><span>This is a test subtitle that most likely 	will span over several rows since it's a pretty long cue with a lot of text.</span></span></div>
diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre_wrapped-ref.html b/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre_wrapped-ref.html
index afcc80c1340..3eb92d702ac 100644
--- a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre_wrapped-ref.html
+++ b/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre_wrapped-ref.html
@@ -17,6 +17,7 @@ body { margin:0 }
     right: 0;
     width: 50%;
     text-align: center;
+    overflow: hidden;
 }
 .cue > span {
     font-family: sans-serif;
@@ -26,4 +27,4 @@ body { margin:0 }
     white-space: pre
 }
 </style>
-<div class="video"><span class="cue"><span>This is a test subtitle that most <br>likely 	will span over several <br>rows since it's a pretty long cue <br>with a lot of text.</span></span></div>
+<div class="video"><span class="cue"><span>This is a test subtitle that most likely 	will span over several rows since it's a pretty long cue with a lot of text.</span></span></div>
diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre_wrapped-ref.html b/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre_wrapped-ref.html
index ec2f45926a2..8b9f12a4e0b 100644
--- a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre_wrapped-ref.html
+++ b/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre_wrapped-ref.html
@@ -17,6 +17,7 @@ body { margin:0 }
     right: 0;
     width: 50%;
     text-align: center;
+    overflow: hidden;
 }
 .cue > span {
     font-family: sans-serif;
@@ -26,4 +27,4 @@ body { margin:0 }
     white-space: pre
 }
 </style>
-<div class="video"><span class="cue"><span>This is a test subtitle that most <br>likely 	will span over several <br>rows since it's a pretty long cue <br>with a lot of text.</span></span></div>
+<div class="video"><span class="cue"><span>This is a test subtitle that most likely 	will span over several rows since it's a pretty long cue with a lot of text.</span></span></div>
diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre_wrapped-ref.html b/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre_wrapped-ref.html
index aee2b7db423..5f32a25d3fd 100644
--- a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre_wrapped-ref.html
+++ b/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre_wrapped-ref.html
@@ -17,6 +17,7 @@ body { margin:0 }
     right: 0;
     width: 50%;
     text-align: center;
+    overflow: hidden;
 }
 .cue > span {
     font-family: sans-serif;
@@ -25,4 +26,4 @@ body { margin:0 }
     white-space: pre
 }
 </style>
-<div class="video"><span class="cue"><span>This is a test subtitle that most <br>likely 	will span over several <br>rows since it's a pretty long cue <br>with a lot of text.</span></span></div>
+<div class="video"><span class="cue"><span>This is a test subtitle that most likely 	will span over several rows since it's a pretty long cue with a lot of text.</span></span></div>
diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre_wrapped-ref.html b/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre_wrapped-ref.html
index 6a7e65867cb..394549b1d83 100644
--- a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre_wrapped-ref.html
+++ b/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre_wrapped-ref.html
@@ -18,6 +18,7 @@ body { margin:0 }
     width: 40%;
     font-family: sans-serif;
     text-align: center;
+    overflow: hidden;
 }
 .cue > span {
     background: rgba(0,0,0,0.8);
@@ -25,4 +26,4 @@ body { margin:0 }
     white-space: pre
 }
 </style>
-<div class="video"><span class="cue"><span>A A  A   A	A	<br>	A		<br>A	A   A  A A</span></span></div>
+<div class="video"><span class="cue"><span>A A  A   A	A		A		A	A   A  A A</span></span></div>